Commit Graph

50309 Commits

Author SHA1 Message Date
Alan Viverette
ad8537778f am c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev
* commit 'c7f8133fa1ff78fea5a54974b5987791cb012f84':
  Update anchor background on the correct view in PopupWindow
2015-08-06 17:55:02 +00:00
Alan Viverette
c7f8133fa1 Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev 2015-08-06 17:48:22 +00:00
Dianne Hackborn
aa8daf7851 am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
* commit '6b0f1e78b841a32b45f513d283202e3af90c6a73':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
2015-08-06 16:55:05 +00:00
Dianne Hackborn
6b0f1e78b8 Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev 2015-08-06 16:48:34 +00:00
Alan Viverette
697804e8de Update anchor background on the correct view in PopupWindow
We were always setting the background of the decor view when the
"above anchor" state changed, rather than the background view.

Bug: 22970244
Change-Id: I3cd7202767ee47cb415736bb3c07369801abccd8
2015-08-06 12:36:47 -04:00
Chet Haase
26762506bc am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev
* commit 'da493aa6eab24de98b63cc63c457f5b899da3ad2':
  Avoid changing internal state of shared drawable
2015-08-06 16:29:00 +00:00
Chet Haase
da493aa6ea Merge "Avoid changing internal state of shared drawable" into mnc-dev 2015-08-06 16:23:20 +00:00
Alan Treadway
e4b8c760ba am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
* commit '190a88d2ce6a08d0eb98d774b81e5ca6b82b45f8':
  Update documentation of DevicePolicyManager intents.
2015-08-06 15:52:38 +00:00
Alan Treadway
190a88d2ce Merge "Update documentation of DevicePolicyManager intents." into mnc-dev 2015-08-06 15:47:34 +00:00
Alan Treadway
4582f8113d Update documentation of DevicePolicyManager intents.
Add additional information about the intentions of result codes in
device-owner and profile-owner launch intents, in alignment with
changes made in http://ag/732321.

Bug: 21063241
Change-Id: I0e0a931739cee5f46e8fc7622fe1de49e26dcb0a
2015-08-06 16:44:52 +01:00
Chet Haase
bfa11e4ab8 Avoid changing internal state of shared drawable
An optimization in ImageView nulled out the internal bitmap of a cached
internal BitmapDrawable object created to wrap a bitmap set on the ImageView.
However, apps can get ahold of that cached object via Drawable.getBitmap(),
resulting in having the state of that object they may be using changing out
from under them.

The change is to null out the cached object when getDrawable() is called, to avoid
leaking internal state that we may change.
That way, the app can continue to use that object if they want to, but we are no longer
relying on it internally, and will create a new one when needed.

Issue #22930646  [1P Regression from L] ImageView is blanked out in Activity in Google Express

Change-Id: Ic86cb93be4897b6ba247c1fabcda507e4ba01300
2015-08-06 07:55:24 -07:00
Michael Wright
46b7af57d7 am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev
* commit 'd5a6df6d228036258d616245502c1a4f85ba4b2e':
  Make the NullVibrator really null.
2015-08-06 13:59:40 +00:00
Michael Wright
d5a6df6d22 Merge "Make the NullVibrator really null." into mnc-dev 2015-08-06 13:52:34 +00:00
Julia Reynolds
24d7c503a1 am a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
* commit 'a3b5a61271bde79ef1072b13ed14525ce53bf62b':
  Store ringer mode on entering DND mode so it can be restored on exit.
2015-08-06 13:48:36 +00:00
Julia Reynolds
a3b5a61271 Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev 2015-08-06 13:41:01 +00:00
Dianne Hackborn
6bdd3a155f Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
Add new Activity callback to tell it when its saved state has
been invalidated.

The problem is that delivering the permission result does not go
through a path where the compatibility code can see it first to
mark its fragment manager as no longer having saved state.  So this
new callback gives it a place to do that.

Change-Id: I5a4a185d9c746bae1afb5c588aba82c8daccf079
2015-08-05 15:01:28 -07:00
Vladislav Kaznacheev
af0a618456 am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev
* commit '8cc00243423e22a36c518cd5ece97b45271ae5e8':
  Keep OverScroller.SplineOverScroller state consistent.
2015-08-05 19:42:25 +00:00
Vladislav Kaznacheev
8cc0024342 Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev 2015-08-05 19:34:38 +00:00
Ajay Panicker
7324b1517c am cda6e878: Implement Bluetooth settings factory reset (2/5)
* commit 'cda6e878cd1b11e10c0b9b4b903b14e11586a963':
  Implement Bluetooth settings factory reset (2/5)
2015-08-05 18:00:49 +00:00
Ajay Panicker
cda6e878cd Implement Bluetooth settings factory reset (2/5)
Implemented the factory reset function to be used to reset all bluetooth
settings on device to factory default

Bug: 16161518
2015-08-05 10:35:15 -07:00
Rubin Xu
16c4e75e82 am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev
* commit 'ab868effb7a54bc6a6b2d35412fe466c0adc7f55':
  Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
2015-08-05 17:00:22 +00:00
Rubin Xu
ab868effb7 Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev 2015-08-05 16:55:50 +00:00
Rubin Xu
41f2ccb9e4 Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
Starting from M, this extra is also supported in NFC bump provisioning.

Bug: 22914251
Change-Id: I835d12918c5de4ff782245def6565eeb0f052934
2015-08-05 17:21:25 +01:00
Niels Egberts
94b5278e65 am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev
* commit '6bdc4637d7ac1df86e9d745ac483987107a71282':
  NPE occured when trying to parcel voice features.
2015-08-05 16:04:31 +00:00
Niels Egberts
6bdc4637d7 Merge "NPE occured when trying to parcel voice features." into mnc-dev 2015-08-05 15:57:55 +00:00
Niels Egberts
54545f7e65 NPE occured when trying to parcel voice features.
The default features member should be an empty list instead of null.

Bug: 22404239
Change-Id: Ia39982f17fd3b3cd0f3556435170aed2fac14fb8
2015-08-05 15:48:26 +01:00
Ian Pedowitz
df27f4b482 am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev
* commit 'df5a66110777554d5b163693ac8395d7c21c328f':
  Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
2015-08-05 14:43:28 +00:00
Ian Pedowitz
df5a661107 Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev 2015-08-05 14:34:13 +00:00
Ian Pedowitz
6cc066df7a Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
This reverts commit 845d14db90.

Bug: 22942480
Bug: 22902898
Change-Id: If2d0e11594284414953c3dd45475fc7ba3366295
2015-08-05 14:25:15 +00:00
Julia Reynolds
9b11fdb56d Store ringer mode on entering DND mode so it can be restored on exit.
Store the value in Settings now, so it's not lost on reboot.
Bug: 22338093

Change-Id: Icc843ef2bf735c23aabf9ceddd82283d51424220
2015-08-05 09:27:23 -04:00
Paul Jensen
66625ff192 am dbc4edcc: Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev
* commit 'dbc4edccfced5cb739bae75e8cd15cecc39cf16e':
  Fix NOT_RESTRICTED network capability and enforce it.
2015-08-05 10:11:40 +00:00
Paul Jensen
dbc4edccfc Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev 2015-08-05 10:03:47 +00:00
Filip Gruszczynski
cae230a4e3 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:55 +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
Roshan Pius
4919306343 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:49:35 +00:00
Vladislav Kaznacheev
84ad7e9ee2 Keep OverScroller.SplineOverScroller state consistent.
Currently update() bails out early if it is called
too soon after mStartTime has been set. In this case
mCurrentPosition remains holding an obsolete value
from a previous animation. This causes some strange
behavior (see the referenced bug).

This patch makes sure that mCurrentPosition is
updated every time that mStart is updated.

Bug: 22950559
Change-Id: I07b92f30ebe29856f4e04dc19a4820123713fd7e
2015-08-04 21:24:59 +00: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
Yohei Yukawa
1fdac7a859 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:03:24 +00:00
Nick Kralevich
5fa85ce6f8 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 19:52:50 +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
Nick Kralevich
97b68bbe71 Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev 2015-08-04 19:46:06 +00:00
Matthew Williams
7d4c58f726 am fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev
* commit 'fad3c6638168ad65b4f4677a777b8f2dc7e5c9c9':
  Remove spurious syncmanager wake-ups
2015-08-04 17:47:52 +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
93919ff1fc am 845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup"
* commit '845d14db9066c3262f270237b52e315aa71508b2':
  Revert "Permissions: GET_ACCOUNTS permission cleanup"
2015-08-04 14:58:24 +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
9fdff2e543 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:37 +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
Paul Jensen
487ffe7d3d Fix NOT_RESTRICTED network capability and enforce it.
With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
   special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
   permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
   CONNECTIVITY_INTERNAL permission

Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
2015-08-04 07:24:24 -04:00