OSDN Git Service
Filip Gruszczynski [Tue, 4 Aug 2015 23:27:22 +0000 (23:27 +0000)]
am
c3080d78: am
841d7b75: am
52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev
* commit '
c3080d7855838bcbe070bddd083a5736687f130b':
Make ResourceKey always use non-null configuration override.
Filip Gruszczynski [Tue, 4 Aug 2015 23:18:47 +0000 (23:18 +0000)]
am
841d7b75: am
52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev
* commit '
841d7b75176f4ba086751f12ac57e5420ce501d8':
Make ResourceKey always use non-null configuration override.
Filip Gruszczynski [Tue, 4 Aug 2015 23:11:24 +0000 (23:11 +0000)]
am
52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev
* commit '
52d3312abeafd988ecb2288896b74ba72c3e70c0':
Make ResourceKey always use non-null configuration override.
Filip Gruszczynski [Tue, 4 Aug 2015 23:02:19 +0000 (23:02 +0000)]
Merge "Make ResourceKey always use non-null configuration override." into mnc-dev
Filip Gruszczynski [Tue, 4 Aug 2015 21:46:33 +0000 (14:46 -0700)]
Make ResourceKey always use non-null configuration override.
We don't differentiate between null conifguration and
Configuration.EMPTY, but if ResourceKey uses both, it will produce
different hashes and won't be equal. This CL makes ResourceKey always
hold a non null reference to the Configuration object.
We started delivering the configuration overrides in
Ib2c7be0b427f5ce05e7a362bcdd496ddbc9164f0, which changed behavior from
using always null, to using both null and Conifguration.EMPTY for empty
confgiuration. Now we will switch to using only one value, which is
Configuration.EMPTY.
Bug:
22620824
Change-Id: I090fd90ac21a6b3ebc7f2974a91dd7c861af10d7
Mitchell Wills [Tue, 4 Aug 2015 22:22:25 +0000 (22:22 +0000)]
am
992ae880: am
e8c888c4: am
385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev
* commit '
992ae880743a49331ea0ab666f4fe3c8617750db':
Charge apps for wifi tx time while scanning
Mitchell Wills [Tue, 4 Aug 2015 22:12:30 +0000 (22:12 +0000)]
am
e8c888c4: am
385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev
* commit '
e8c888c41949c174f8cc244f8d705e675a2f3c30':
Charge apps for wifi tx time while scanning
Roshan Pius [Tue, 4 Aug 2015 22:02:41 +0000 (22:02 +0000)]
am
1c53d91e: am
65b84a16: am
78b8d4aa: Mark missed calls as read in calllog restore(2/2)
* commit '
1c53d91e815fe281855a1ba5fa3944bcf67eba7c':
Mark missed calls as read in calllog restore(2/2)
Mitchell Wills [Tue, 4 Aug 2015 22:02:24 +0000 (22:02 +0000)]
am
385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev
* commit '
385dfd349ff773c499859ee44552995e9c25759c':
Charge apps for wifi tx time while scanning
Roshan Pius [Tue, 4 Aug 2015 21:56:58 +0000 (21:56 +0000)]
am
65b84a16: am
78b8d4aa: Mark missed calls as read in calllog restore(2/2)
* commit '
65b84a165239ea8e50b8a7129da7eb1ad4536308':
Mark missed calls as read in calllog restore(2/2)
Mitchell Wills [Tue, 4 Aug 2015 21:55:46 +0000 (21:55 +0000)]
Merge "Charge apps for wifi tx time while scanning" into mnc-dev
Roshan Pius [Tue, 4 Aug 2015 21:48:38 +0000 (21:48 +0000)]
am
78b8d4aa: Mark missed calls as read in calllog restore(2/2)
* commit '
78b8d4aa99ce866caacf291a446837416fa07bd7':
Mark missed calls as read in calllog restore(2/2)
Mitchell Wills [Thu, 30 Jul 2015 00:47:44 +0000 (17:47 -0700)]
Charge apps for wifi tx time while scanning
Bug:
22955562
Change-Id: Ie2c6ab65e7b592272e1cad120ac606fcfd6ea677
Jean-Michel Trivi [Tue, 4 Aug 2015 21:16:49 +0000 (21:16 +0000)]
am
0ca9e2df: am
4032c94d: am
fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev
* commit '
0ca9e2dffb60781b4bdfa2a4a012f7ee2afa02b8':
AudioService: check for audio device connection success
Roshan Pius [Tue, 4 Aug 2015 20:23:03 +0000 (13:23 -0700)]
Mark missed calls as read in calllog restore(2/2)
When missed calls are restored by CalllogBackupAgent using the addCall
API of CallLog provider, we were setting the IS_READ flag to 0 which
resulted in user getting a missed call notifications for all missed
calls after restore.
Adding a new addCall API signature which can specify the value to be put in the
IS_READ field when a call is added to the calllog provider. This will be
used by the CallLogBackupAgent to mark all restored missed calls as
read.
BUG:
22908952
Change-Id: Iee3bea09fbdefef09c7eb6c6c61728cb4d94d9e7
Jean-Michel Trivi [Tue, 4 Aug 2015 21:06:32 +0000 (21:06 +0000)]
am
4032c94d: am
fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev
* commit '
4032c94d579bc63387f30fd5a3e41083c2bd09fb':
AudioService: check for audio device connection success
Svetoslav Ganov [Tue, 4 Aug 2015 21:06:13 +0000 (21:06 +0000)]
am
b381d697: am
073bfb9b: am
ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev
* commit '
b381d697310c14cef50e0e80bebd15a97b8e9c84':
Ensure per package and per UID state share same package settings.
Yohei Yukawa [Tue, 4 Aug 2015 21:06:06 +0000 (21:06 +0000)]
am
9aebdb4c: am
d7d14033: am
2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev
* commit '
9aebdb4c39bd958f0a568539ea503b2da494802e':
Revert "Do not forceLayout when window is resized"
Nick Kralevich [Tue, 4 Aug 2015 21:05:57 +0000 (21:05 +0000)]
am
2eafb06f: am
b2c71814: am
97b68bbe: Merge "UsbDeviceManager: fix b/
21429947 regression (try #2)" into mnc-dev
* commit '
2eafb06f5d618015e0bbcd31f8537664914d749d':
UsbDeviceManager: fix b/
21429947 regression (try #2)
Jean-Michel Trivi [Tue, 4 Aug 2015 20:55:57 +0000 (20:55 +0000)]
am
fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev
* commit '
fc5a4bf0e1520bf3acd75226d760b8e1d7cdd59f':
AudioService: check for audio device connection success
Svetoslav Ganov [Tue, 4 Aug 2015 20:54:52 +0000 (20:54 +0000)]
am
073bfb9b: am
ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev
* commit '
073bfb9bec7bc407c50a23a2317852cb0d69599b':
Ensure per package and per UID state share same package settings.
Yohei Yukawa [Tue, 4 Aug 2015 20:54:48 +0000 (20:54 +0000)]
am
d7d14033: am
2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev
* commit '
d7d14033af438b88053454e7d73c1689eaa77c35':
Revert "Do not forceLayout when window is resized"
Nick Kralevich [Tue, 4 Aug 2015 20:54:44 +0000 (20:54 +0000)]
am
b2c71814: am
97b68bbe: Merge "UsbDeviceManager: fix b/
21429947 regression (try #2)" into mnc-dev
* commit '
b2c718146b1be18942bc5d76be68e0d437cbbe8b':
UsbDeviceManager: fix b/
21429947 regression (try #2)
Jean-Michel Trivi [Tue, 4 Aug 2015 20:45:18 +0000 (20:45 +0000)]
Merge "AudioService: check for audio device connection success" into mnc-dev
Svetoslav Ganov [Tue, 4 Aug 2015 20:40:45 +0000 (20:40 +0000)]
am
ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev
* commit '
ce68917c849548d80d9aca14f262d22d9c47c3dc':
Ensure per package and per UID state share same package settings.
Yohei Yukawa [Tue, 4 Aug 2015 20:40:41 +0000 (20:40 +0000)]
am
2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev
* commit '
2d34a8b7181635c0ff0b1f2390d70e3ac6960f00':
Revert "Do not forceLayout when window is resized"
Nick Kralevich [Tue, 4 Aug 2015 20:40:35 +0000 (20:40 +0000)]
am
97b68bbe: Merge "UsbDeviceManager: fix b/
21429947 regression (try #2)" into mnc-dev
* commit '
97b68bbe7180ca15ab10d6f65bbdac6c7e64885b':
UsbDeviceManager: fix b/
21429947 regression (try #2)
Paul Soulos [Tue, 4 Aug 2015 20:21:59 +0000 (20:21 +0000)]
am
3adc6671: Merge "Fix doc typo for default wearable notification size." into cw-e-dev
* commit '
3adc6671e965353a946ce77ecdf1ac041b607ccd':
Fix doc typo for default wearable notification size.
Svetoslav Ganov [Tue, 4 Aug 2015 20:21:44 +0000 (20:21 +0000)]
Merge "Ensure per package and per UID state share same package settings." into mnc-dev
Paul Soulos [Tue, 4 Aug 2015 20:13:41 +0000 (20:13 +0000)]
Merge "Fix doc typo for default wearable notification size." into cw-e-dev
John Reck [Tue, 4 Aug 2015 20:03:26 +0000 (20:03 +0000)]
am
e28c5d62: am
a975a844: am
70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev
* commit '
e28c5d62aad1d14901ccfe40e5177f5794c42f2b':
Fix crash in kModeProcessNoContext
John Reck [Tue, 4 Aug 2015 19:54:45 +0000 (19:54 +0000)]
am
a975a844: am
70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev
* commit '
a975a84498014526d665f3bf7d0a5387f6e8a96b':
Fix crash in kModeProcessNoContext
Yohei Yukawa [Tue, 4 Aug 2015 19:51:20 +0000 (19:51 +0000)]
Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev
John Reck [Tue, 4 Aug 2015 19:48:30 +0000 (19:48 +0000)]
am
70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev
* commit '
70e5db9413f82bf1f000bd99b3d2dbecf6e4ab04':
Fix crash in kModeProcessNoContext
Nick Kralevich [Tue, 4 Aug 2015 19:46:06 +0000 (19:46 +0000)]
Merge "UsbDeviceManager: fix b/
21429947 regression (try #2)" into mnc-dev
John Reck [Tue, 4 Aug 2015 19:38:15 +0000 (19:38 +0000)]
Merge "Fix crash in kModeProcessNoContext" into mnc-dev
Paul Soulos [Tue, 4 Aug 2015 18:59:45 +0000 (11:59 -0700)]
Fix doc typo for default wearable notification size.
Change-Id: Ic3428278eee0b541de3e1b355692401170d1ab3b
Julia Reynolds [Tue, 4 Aug 2015 18:50:18 +0000 (18:50 +0000)]
am
8d45b98d: am
36fc79e2: am
35a1a209: Merge "Include dnd status in bugreports." into mnc-dev
* commit '
8d45b98def417c70af2ce98bc40078279cba6a7d':
Include dnd status in bugreports.
Julia Reynolds [Tue, 4 Aug 2015 18:41:20 +0000 (18:41 +0000)]
am
36fc79e2: am
35a1a209: Merge "Include dnd status in bugreports." into mnc-dev
* commit '
36fc79e2f8f4b4e186dd7de4c646639c434f3e8b':
Include dnd status in bugreports.
Julia Reynolds [Tue, 4 Aug 2015 18:33:15 +0000 (18:33 +0000)]
am
35a1a209: Merge "Include dnd status in bugreports." into mnc-dev
* commit '
35a1a2095cb6208a7614c35fe19fced6026d3db1':
Include dnd status in bugreports.
Julia Reynolds [Tue, 4 Aug 2015 18:27:13 +0000 (18:27 +0000)]
Merge "Include dnd status in bugreports." into mnc-dev
John Reck [Tue, 4 Aug 2015 18:17:39 +0000 (11:17 -0700)]
Fix crash in kModeProcessNoContext
Bug:
22931143
Change-Id: I9897a28b1edd006aee67ae2343874ad92bbd15a0
Svet Ganov [Tue, 4 Aug 2015 18:13:44 +0000 (11:13 -0700)]
Ensure per package and per UID state share same package settings.
When renaming a package during an OTA we were getting in a state
where the package setting mapped to the package UID was not the
same instance as the one we create for the new package mapped.
This leads to a drift between the permissions state for the package
and that state for the UID, resulting in broken for UID permission
checks as granted permissions were never appearing in the per UID
package setting.
bug:
22928831
Change-Id: Ib0372632ec84a917304561fd94032cd09bb4c12f
Matthew Williams [Tue, 4 Aug 2015 18:06:24 +0000 (18:06 +0000)]
am
c62598bc: am
d5fe5a8f: am
fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev
* commit '
c62598bc58a7a266df932a3c2f1c3694f732365a':
Remove spurious syncmanager wake-ups
Matthew Williams [Tue, 4 Aug 2015 17:57:23 +0000 (17:57 +0000)]
am
d5fe5a8f: am
fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev
* commit '
d5fe5a8fa1f770b929dbd786381a6ad45a754301':
Remove spurious syncmanager wake-ups
Matthew Williams [Tue, 4 Aug 2015 17:46:11 +0000 (17:46 +0000)]
am
fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev
* commit '
fad3c6638168ad65b4f4677a777b8f2dc7e5c9c9':
Remove spurious syncmanager wake-ups
Nick Kralevich [Thu, 30 Jul 2015 23:29:57 +0000 (16:29 -0700)]
UsbDeviceManager: fix b/
21429947 regression (try #2)
As discussed in b/
21429947 (commit
674019065bceb4150190bfb1aa63cda9de0a8560), MTP must always be
enabled, even if access to the underlying MTP data is disabled.
Otherwise, Android will not enumerate on the USB bus, and won't
receive notifications from the kernel about USB state changes. This
effectively prevents using MTP functionality on user builds, or
on userdebug/eng builds with adb turned off.
Always ensure that MTP is the default driver mode.
Move the DISALLOW_USB_FILE_TRANSFER filtering of mUsbDataUnlocked from
setting time to the time we post the sticky broadcast.
Remove isUsbDataUnlocked(). It essentially duplicates data in the sticky
broadcast.
Bug:
22447614
Bug:
21429947
Change-Id: I9d0d94cadbf6db6281ebd77bfb7162f9d06520c2
Matthew Williams [Tue, 4 Aug 2015 17:35:48 +0000 (17:35 +0000)]
Merge "Remove spurious syncmanager wake-ups" into mnc-dev
Ian Pedowitz [Tue, 4 Aug 2015 15:11:51 +0000 (15:11 +0000)]
am
8a4465e8: am
682e0237: am
845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup"
* commit '
8a4465e8ec7da6bf9dfcec760ebd359c191a0617':
Revert "Permissions: GET_ACCOUNTS permission cleanup"
Ian Pedowitz [Tue, 4 Aug 2015 15:02:41 +0000 (15:02 +0000)]
am
682e0237: am
845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup"
* commit '
682e0237eccd58efac776fd282021ec16259b632':
Revert "Permissions: GET_ACCOUNTS permission cleanup"
Wale Ogunwale [Tue, 4 Aug 2015 15:00:12 +0000 (15:00 +0000)]
am
c170d7de: am
ae351ec1: am
b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev
* commit '
c170d7ded3b59aaed080e2315868e60bbadb9669':
Fail silently if a process trys to launch an acitvity for background user
Ian Pedowitz [Tue, 4 Aug 2015 14:55:54 +0000 (14:55 +0000)]
am
845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup"
* commit '
845d14db9066c3262f270237b52e315aa71508b2':
Revert "Permissions: GET_ACCOUNTS permission cleanup"
Wale Ogunwale [Tue, 4 Aug 2015 14:53:33 +0000 (14:53 +0000)]
am
ae351ec1: am
b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev
* commit '
ae351ec112dc5ad23585552af30a138aa29ed2f5':
Fail silently if a process trys to launch an acitvity for background user
Ian Pedowitz [Tue, 4 Aug 2015 14:47:37 +0000 (07:47 -0700)]
Revert "Permissions: GET_ACCOUNTS permission cleanup"
Temporarily revert ag/735253 until b/
22902898 can be resolved with a
proper DMAgent prebuilt drop.
This reverts commit
e7ed827a104ba005b93faa2edb3bc77f72b240ec.
Bug:
22902898
Wale Ogunwale [Tue, 4 Aug 2015 14:46:07 +0000 (14:46 +0000)]
am
b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev
* commit '
b2690f3857d207321c8e6dc85a3b529ac52404f2':
Fail silently if a process trys to launch an acitvity for background user
Wale Ogunwale [Tue, 4 Aug 2015 14:38:04 +0000 (14:38 +0000)]
Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev
Jason Monk [Tue, 4 Aug 2015 14:07:07 +0000 (14:07 +0000)]
am
88d616c8: am
bbb17765: am
55dbf2d7: Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev
* commit '
88d616c80c54aeb99abeb1534b14436780ede253':
QS: Allow Flashlight Tile to handle reset state
Jason Monk [Tue, 4 Aug 2015 13:59:25 +0000 (13:59 +0000)]
am
bbb17765: am
55dbf2d7: Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev
* commit '
bbb1776581330257f16e2bf0a85d9bafb73395d1':
QS: Allow Flashlight Tile to handle reset state
Jason Monk [Tue, 4 Aug 2015 13:52:34 +0000 (13:52 +0000)]
am
55dbf2d7: Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev
* commit '
55dbf2d78e575b6c7b53e06aed17ff7406305a13':
QS: Allow Flashlight Tile to handle reset state
Jason Monk [Tue, 4 Aug 2015 13:43:21 +0000 (13:43 +0000)]
Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev
Pavlin Radoslavov [Tue, 4 Aug 2015 04:59:12 +0000 (04:59 +0000)]
am
ce3ef9c8: am
4e07468f: am
29b8c4ab: Reset the pointer to the Bluetooth GATT service
* commit '
ce3ef9c86df12a36ae8f94cdd5531b82e86e1125':
Reset the pointer to the Bluetooth GATT service
Pavlin Radoslavov [Tue, 4 Aug 2015 04:50:20 +0000 (04:50 +0000)]
am
4e07468f: am
29b8c4ab: Reset the pointer to the Bluetooth GATT service
* commit '
4e07468fcec44f97dffde9533b1480674dc47d86':
Reset the pointer to the Bluetooth GATT service
Pavlin Radoslavov [Tue, 4 Aug 2015 04:41:42 +0000 (04:41 +0000)]
am
29b8c4ab: Reset the pointer to the Bluetooth GATT service
* commit '
29b8c4ab8ac4942e46a9ad4ced795bf06b9f8481':
Reset the pointer to the Bluetooth GATT service
Pavlin Radoslavov [Tue, 4 Aug 2015 00:44:47 +0000 (17:44 -0700)]
Reset the pointer to the Bluetooth GATT service
During error recovery, if the mBluetooth pointer is reset to null,
reset the mBluetoothGatt pointer as well.
Bug:
21756298
Change-Id: I26204ba47dd3c5465bb7de30cfa5dc0f07eee2fd
Adam Lesinski [Tue, 4 Aug 2015 01:53:31 +0000 (01:53 +0000)]
am
4eb6c10d: am
7608f541: am
59d72c86: Merge "BatteryStats: Add debug logging to find source of b/
22716723" into mnc-dev
* commit '
4eb6c10d2d9da3ac4d31fb4fadce08a08940464f':
BatteryStats: Add debug logging to find source of b/
22716723
Adam Lesinski [Tue, 4 Aug 2015 01:43:42 +0000 (01:43 +0000)]
am
7608f541: am
59d72c86: Merge "BatteryStats: Add debug logging to find source of b/
22716723" into mnc-dev
* commit '
7608f5416dec7e7756b3c519b88ca348a3b196bc':
BatteryStats: Add debug logging to find source of b/
22716723
Adam Lesinski [Tue, 4 Aug 2015 01:35:06 +0000 (01:35 +0000)]
am
59d72c86: Merge "BatteryStats: Add debug logging to find source of b/
22716723" into mnc-dev
* commit '
59d72c86269f4d0c914c233d16a9bf00f0440df8':
BatteryStats: Add debug logging to find source of b/
22716723
Dianne Hackborn [Tue, 4 Aug 2015 01:30:52 +0000 (01:30 +0000)]
am
24922798: am
b20a8ed9: am
d9b0f843: Merge "Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
* commit '
2492279816d41770f802835efdbc1169b00834bd':
Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs
Adam Lesinski [Tue, 4 Aug 2015 01:26:27 +0000 (01:26 +0000)]
Merge "BatteryStats: Add debug logging to find source of b/
22716723" into mnc-dev
Dianne Hackborn [Tue, 4 Aug 2015 01:19:55 +0000 (01:19 +0000)]
am
b20a8ed9: am
d9b0f843: Merge "Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
* commit '
b20a8ed952e703801eebde2e6d9280b5bac0a689':
Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs
Prem Kumar [Tue, 4 Aug 2015 01:18:12 +0000 (01:18 +0000)]
am
54c7ddbc: am
482ba343: am
04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev
* commit '
54c7ddbccd71c387c75deb36777b4aede8f226a1':
Make default selection for contact sharing to "Checked".
Wale Ogunwale [Tue, 4 Aug 2015 01:18:06 +0000 (01:18 +0000)]
am
26e11906: am
ce8921c3: am
911bd0d3: Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev
* commit '
26e11906781234e5a95bf536f1049c58c244a924':
Set broadcast nextReceiver correctly when package is disabled
John Reck [Tue, 4 Aug 2015 01:18:00 +0000 (01:18 +0000)]
am
0c9ec1f2: am
2e529712: am
c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
* commit '
0c9ec1f2b79835360b82b8cc91801a46c4352440':
Disable skipping frames on empty damage
Svetoslav Ganov [Tue, 4 Aug 2015 01:17:54 +0000 (01:17 +0000)]
am
db67d5b7: am
ba6cdbfd: am
ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev
* commit '
db67d5b79ab2da6d8b8a1211b354687fb7930744':
Notify settings URI change without a lock held
Dianne Hackborn [Tue, 4 Aug 2015 01:17:46 +0000 (01:17 +0000)]
am
5dd9ef04: am
b0bc8368: am
3011f645: Merge "Fix issue #
22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev
* commit '
5dd9ef044cd15b728bf58d1f612f6956077bd709':
Fix issue #
22912704: "android.process.acore has stopped" dialog keeps popping up
John Reck [Tue, 4 Aug 2015 01:17:37 +0000 (01:17 +0000)]
am
8e645d58: am
649c3c44: am
7290d93d: Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev
* commit '
8e645d58f1476eca5ca8871bc348047e1c188c4f':
Yell loudly about undefined behind in Bitmap, but work anyway
Jeff Sharkey [Tue, 4 Aug 2015 01:17:29 +0000 (01:17 +0000)]
am
cdd4cfb9: am
d4842c37: am
0faca96f: Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev
* commit '
cdd4cfb95616c725d483d265e1aecd740ef0a8a5':
Avoid deadlock by broadcasting outside lock.
Matthew Williams [Mon, 3 Aug 2015 22:56:36 +0000 (15:56 -0700)]
Remove spurious syncmanager wake-ups
BUG:
22287469
1) Fix SyncManager waking up every 2 hrs if there is nothing
to do.
2) Fix sync wake-up alarm not being properly updated if the new
alarm was in the future.
2a) Due to staus bar sync signal that were removed post-K
one of the wake-ups was for 30s in the future, removed this
@hide intent completely.
3) The SyncManager will still set a timeout alarm for 5mins after
the start of a sync. Leaving this in as to post to a handler is
less expensive but more complex, and the alarm update is
correctly working now.
Change-Id: If51c9dd68391ccaeb480a17eb5a1364c4afe4c2a
Dianne Hackborn [Tue, 4 Aug 2015 01:12:33 +0000 (01:12 +0000)]
am
d9b0f843: Merge "Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
* commit '
d9b0f8435ba9b099512288729af24858a95fd013':
Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs
Prem Kumar [Tue, 4 Aug 2015 01:09:20 +0000 (01:09 +0000)]
am
482ba343: am
04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev
* commit '
482ba34383796d87e4832ace98b0bb1934c8ef72':
Make default selection for contact sharing to "Checked".
Wale Ogunwale [Tue, 4 Aug 2015 01:09:16 +0000 (01:09 +0000)]
am
ce8921c3: am
911bd0d3: Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev
* commit '
ce8921c3c02b88fcf940e085ac34f3933f5522ac':
Set broadcast nextReceiver correctly when package is disabled
John Reck [Tue, 4 Aug 2015 01:09:12 +0000 (01:09 +0000)]
am
2e529712: am
c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
* commit '
2e529712e67b94aefec81d0e081f9c34c4fef3f7':
Disable skipping frames on empty damage
Svetoslav Ganov [Tue, 4 Aug 2015 01:09:07 +0000 (01:09 +0000)]
am
ba6cdbfd: am
ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev
* commit '
ba6cdbfdbbbb6f83052e895a698fcc0d71793b25':
Notify settings URI change without a lock held
Dianne Hackborn [Tue, 4 Aug 2015 01:09:02 +0000 (01:09 +0000)]
am
b0bc8368: am
3011f645: Merge "Fix issue #
22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev
* commit '
b0bc8368f53e80236026e54311f2dda7b662c664':
Fix issue #
22912704: "android.process.acore has stopped" dialog keeps popping up
John Reck [Tue, 4 Aug 2015 01:08:58 +0000 (01:08 +0000)]
am
649c3c44: am
7290d93d: Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev
* commit '
649c3c440e97f94971f5f2c8c4b08338c785c582':
Yell loudly about undefined behind in Bitmap, but work anyway
Jeff Sharkey [Tue, 4 Aug 2015 01:08:54 +0000 (01:08 +0000)]
am
d4842c37: am
0faca96f: Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev
* commit '
d4842c374ab8f5578c8faca5a7e3f8d90bd7fab3':
Avoid deadlock by broadcasting outside lock.
Dianne Hackborn [Tue, 4 Aug 2015 01:07:36 +0000 (01:07 +0000)]
Merge "Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
Prem Kumar [Tue, 4 Aug 2015 01:00:47 +0000 (01:00 +0000)]
am
04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev
* commit '
04e2cf6bc5167583d686c2a118ec2b50a7b88547':
Make default selection for contact sharing to "Checked".
Wale Ogunwale [Tue, 4 Aug 2015 01:00:38 +0000 (01:00 +0000)]
am
911bd0d3: Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev
* commit '
911bd0d3a587a9a58e2bc1cf59615b039ea0e5b2':
Set broadcast nextReceiver correctly when package is disabled
John Reck [Tue, 4 Aug 2015 01:00:24 +0000 (01:00 +0000)]
am
c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
* commit '
c03ab87ac9f721ff22bfe5e9c0cd0e5be64f261e':
Disable skipping frames on empty damage
Svetoslav Ganov [Tue, 4 Aug 2015 01:00:17 +0000 (01:00 +0000)]
am
ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev
* commit '
ac8c98614cb8260615795b2042699d93b21a1097':
Notify settings URI change without a lock held
Dianne Hackborn [Tue, 4 Aug 2015 01:00:12 +0000 (01:00 +0000)]
am
3011f645: Merge "Fix issue #
22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev
* commit '
3011f645abe8f976af6f876579a179d51c09bf30':
Fix issue #
22912704: "android.process.acore has stopped" dialog keeps popping up
John Reck [Tue, 4 Aug 2015 01:00:04 +0000 (01:00 +0000)]
am
7290d93d: Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev
* commit '
7290d93df99de9d21ac8a9ddf72bc095b319af4b':
Yell loudly about undefined behind in Bitmap, but work anyway
Jeff Sharkey [Tue, 4 Aug 2015 00:59:58 +0000 (00:59 +0000)]
am
0faca96f: Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev
* commit '
0faca96f939b8530e5387a30e317d852f39f689f':
Avoid deadlock by broadcasting outside lock.
Prem Kumar [Tue, 4 Aug 2015 00:41:46 +0000 (00:41 +0000)]
Merge "Make default selection for contact sharing to "Checked"." into mnc-dev
Wale Ogunwale [Tue, 4 Aug 2015 00:33:48 +0000 (00:33 +0000)]
Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev
Dianne Hackborn [Tue, 4 Aug 2015 00:14:46 +0000 (17:14 -0700)]
Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs
Add new Activity.isVoiceInteractionRoot() API that an activity can use
to determine whether it is the root activity of a voice interaction
session started by the user's designated voice interaction service.
This is a special new API that apps must explicitly check, because as
with visual activities the model behind an activity should usually be
that it accomplishes its task by interacting with the user (implicitly
getting their approval) rather than trusting that whoever invoked it
is telling it to do what the user once. In the voice world, however,
there are some cases where quick interactions want to allow for immediate
execution without further user involvement, so this API allows for that
without opening up security holes from other applications.
Change-Id: Ie02d2458f16cb0b12af825641bcf8beaf086931b
Wale Ogunwale [Mon, 3 Aug 2015 22:21:44 +0000 (15:21 -0700)]
Set broadcast nextReceiver correctly when package is disabled
When we are cleaning up broadcat receivers due to a package been
disabled, it is possible to remove enough recievers to cause the
nextReceiver index to be greater than the size of recievers list.
We now set the nextReceiver to the size of the receiver list
(which means done processing) for this case.
Bug:
22874330
Change-Id: Ie151d1b5bff4c11533b3a8635fe5ee82eb21c13c
Jean-Michel Trivi [Tue, 4 Aug 2015 00:26:01 +0000 (17:26 -0700)]
AudioService: check for audio device connection success
When connecting/disconnecting and audio device, AudioService
was assuming that the call was always successful through
AudioSystem.setDeviceConnectionState(). In the case of the
connection of a wired headset (mic + headphones), this also
causes A2DP to not be used for media playback.
The connection can fail if the audio device being connected
is not supported by the platform. But if this failure is
not taken into account for DEVICE_OUT_WIRED_HEADSET or
HEADPHONES, A2DP would still be avoided even when an A2DP
device reconnects at boot.
The fix consists in executing the connection logic only when
the connection was deemed successful. Nothing is altered
on the disconnection code path, or the direct connection
of A2DP.
The javadoc is updated in AudioSystem to indicate the return
codes to take into account in setDeviceConnectionState().
Bug
22511833
Change-Id: I22f0d2c7d4ab4fb9ee1be2f248907f721596a16f
John Reck [Mon, 3 Aug 2015 23:33:13 +0000 (23:33 +0000)]
Merge "Disable skipping frames on empty damage" into mnc-dev