Commit Graph

198706 Commits

Author SHA1 Message Date
Jae Seo
c632313e72 am 2094a702: Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev
* commit '2094a702b33f0bc4e1c22b85a8a6e8bc8988a079':
  Unregister the existing callback when MediaProjection stops
2015-08-05 00:14:13 +00:00
Jae Seo
2094a702b3 Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev 2015-08-05 00:07:11 +00:00
Jeff Sharkey
64e26348bc am 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev
* commit '0d6168835a6114a9e346278e4613e9175a907fd3':
  Fix moving of apps into legacy ASEC.
2015-08-04 23:38:27 +00:00
Jeff Sharkey
0d6168835a Merge "Fix moving of apps into legacy ASEC." into mnc-dev 2015-08-04 23:27:43 +00:00
Filip Gruszczynski
841d7b7517 am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev
* commit '52d3312abeafd988ecb2288896b74ba72c3e70c0':
  Make ResourceKey always use non-null configuration override.
2015-08-04 23:11:24 +00:00
Filip Gruszczynski
52d3312abe Merge "Make ResourceKey always use non-null configuration override." into mnc-dev 2015-08-04 23:02:19 +00:00
Filip Gruszczynski
a01f48681c 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
2015-08-04 15:26:14 -07:00
Mitchell Wills
e8c888c419 am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev
* commit '385dfd349ff773c499859ee44552995e9c25759c':
  Charge apps for wifi tx time while scanning
2015-08-04 22:02:24 +00:00
Mitchell Wills
385dfd349f Merge "Charge apps for wifi tx time while scanning" into mnc-dev 2015-08-04 21:55:46 +00:00
Roshan Pius
65b84a1652 am 78b8d4aa: Mark missed calls as read in calllog restore(2/2)
* commit '78b8d4aa99ce866caacf291a446837416fa07bd7':
  Mark missed calls as read in calllog restore(2/2)
2015-08-04 21:48:38 +00:00
Mitchell Wills
f901649bd9 Charge apps for wifi tx time while scanning
Bug: 22955562
Change-Id: Ie2c6ab65e7b592272e1cad120ac606fcfd6ea677
2015-08-04 14:47:01 -07:00
Roshan Pius
78b8d4aa99 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
2015-08-04 14:10:49 -07:00
Jean-Michel Trivi
4032c94d57 am fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev
* commit 'fc5a4bf0e1520bf3acd75226d760b8e1d7cdd59f':
  AudioService: check for audio device connection success
2015-08-04 20:55:57 +00:00
Jean-Michel Trivi
fc5a4bf0e1 Merge "AudioService: check for audio device connection success" into mnc-dev 2015-08-04 20:45:18 +00:00
Svetoslav Ganov
073bfb9bec 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.
2015-08-04 20:40:45 +00:00
Yohei Yukawa
d7d14033af am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev
* commit '2d34a8b7181635c0ff0b1f2390d70e3ac6960f00':
  Revert "Do not forceLayout when window is resized"
2015-08-04 20:40:41 +00:00
Nick Kralevich
b2c718146b am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev
* commit '97b68bbe7180ca15ab10d6f65bbdac6c7e64885b':
  UsbDeviceManager: fix b/21429947 regression (try #2)
2015-08-04 20:40:35 +00:00
Jae Seo
ac3f8e5534 Unregister the existing callback when MediaProjection stops
Also removed the unnecessary lock in binderDied.

Bug: 22812934
Change-Id: Ief8856276dbd45a4afa632e51df18bd7d60e6bb1
2015-08-04 13:30:56 -07:00
Svetoslav Ganov
ce68917c84 Merge "Ensure per package and per UID state share same package settings." into mnc-dev 2015-08-04 20:21:44 +00:00
Yohei Yukawa
2d34a8b718 Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev 2015-08-04 19:51:20 +00:00
John Reck
a975a84498 am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev
* commit '70e5db9413f82bf1f000bd99b3d2dbecf6e4ab04':
  Fix crash in kModeProcessNoContext
2015-08-04 19:48:30 +00:00
Nick Kralevich
97b68bbe71 Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev 2015-08-04 19:46:06 +00:00
John Reck
70e5db9413 Merge "Fix crash in kModeProcessNoContext" into mnc-dev 2015-08-04 19:38:15 +00:00
Julia Reynolds
36fc79e2f8 am 35a1a209: Merge "Include dnd status in bugreports." into mnc-dev
* commit '35a1a2095cb6208a7614c35fe19fced6026d3db1':
  Include dnd status in bugreports.
2015-08-04 18:33:15 +00:00
Julia Reynolds
35a1a2095c Merge "Include dnd status in bugreports." into mnc-dev 2015-08-04 18:27:13 +00:00
John Reck
95cd24bb9d Fix crash in kModeProcessNoContext
Bug: 22931143
Change-Id: I9897a28b1edd006aee67ae2343874ad92bbd15a0
2015-08-04 18:19:11 +00:00
Svet Ganov
e7af1942ba 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
2015-08-04 11:13:47 -07:00
Matthew Williams
d5fe5a8fa1 am fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev
* commit 'fad3c6638168ad65b4f4677a777b8f2dc7e5c9c9':
  Remove spurious syncmanager wake-ups
2015-08-04 17:46:11 +00:00
Nick Kralevich
1a008c1ca0 UsbDeviceManager: fix b/21429947 regression (try #2)
As discussed in b/21429947 (commit
674019065b), 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
2015-08-04 10:36:37 -07:00
Matthew Williams
fad3c66381 Merge "Remove spurious syncmanager wake-ups" into mnc-dev 2015-08-04 17:35:48 +00:00
Ian Pedowitz
682e0237ec am 845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup"
* commit '845d14db9066c3262f270237b52e315aa71508b2':
  Revert "Permissions: GET_ACCOUNTS permission cleanup"
2015-08-04 14:55:54 +00:00
Ian Pedowitz
845d14db90 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 e7ed827a10.

Bug: 22902898
2015-08-04 07:47:37 -07:00
Wale Ogunwale
ae351ec112 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
2015-08-04 14:46:07 +00:00
Wale Ogunwale
b2690f3857 Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev 2015-08-04 14:38:04 +00:00
Jason Monk
bbb1776581 am 55dbf2d7: Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev
* commit '55dbf2d78e575b6c7b53e06aed17ff7406305a13':
  QS: Allow Flashlight Tile to handle reset state
2015-08-04 13:52:34 +00:00
Jason Monk
55dbf2d78e Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev 2015-08-04 13:43:21 +00:00
Pavlin Radoslavov
4e07468fce am 29b8c4ab: Reset the pointer to the Bluetooth GATT service
* commit '29b8c4ab8ac4942e46a9ad4ced795bf06b9f8481':
  Reset the pointer to the Bluetooth GATT service
2015-08-04 04:41:42 +00:00
Pavlin Radoslavov
29b8c4ab8a 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
2015-08-04 04:31:12 +00:00
Adam Lesinski
7608f5416d 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
2015-08-04 01:35:06 +00:00
Jeff Sharkey
94dacb1218 Fix moving of apps into legacy ASEC.
Derive the correct current volume UUID for comparison, and only
check for cluster style installs when moving from internal storage.

Bug: 22616484
Change-Id: Idb6be2aa4aaa9b9f47ebbeeebd65c15a60d5d164
2015-08-03 18:28:06 -07:00
Adam Lesinski
59d72c8626 Merge "BatteryStats: Add debug logging to find source of b/22716723" into mnc-dev 2015-08-04 01:26:27 +00:00
Matthew Williams
665d0140ef 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
2015-08-03 18:15:12 -07:00
Dianne Hackborn
b20a8ed952 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
2015-08-04 01:12:33 +00:00
Dianne Hackborn
d9b0f8435b Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev 2015-08-04 01:07:36 +00:00
Prem Kumar
482ba34383 am 04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev
* commit '04e2cf6bc5167583d686c2a118ec2b50a7b88547':
  Make default selection for contact sharing to "Checked".
2015-08-04 01:00:47 +00:00
Wale Ogunwale
ce8921c3c0 am 911bd0d3: Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev
* commit '911bd0d3a587a9a58e2bc1cf59615b039ea0e5b2':
  Set broadcast nextReceiver correctly when package is disabled
2015-08-04 01:00:38 +00:00
John Reck
2e529712e6 am c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
* commit 'c03ab87ac9f721ff22bfe5e9c0cd0e5be64f261e':
  Disable skipping frames on empty damage
2015-08-04 01:00:24 +00:00
Svetoslav Ganov
ba6cdbfdbb am ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev
* commit 'ac8c98614cb8260615795b2042699d93b21a1097':
  Notify settings URI change without a lock held
2015-08-04 01:00:17 +00:00
Dianne Hackborn
b0bc8368f5 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
2015-08-04 01:00:12 +00:00
John Reck
649c3c440e 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
2015-08-04 01:00:04 +00:00