Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
206,604 Commits 3 Branches 0 Tags
1da56c0bc9d30649e255d721428a95b79fa668b2
Commit Graph

50664 Commits

Author SHA1 Message Date
Alan Viverette
1da56c0bc9 am 3fd42737: am 8a782c9d: am db576e1d: am c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev 
* commit '3fd42737b77e499a0f8ed5ef8aa14ebdcf5f7767':
  Update anchor background on the correct view in PopupWindow
 2015-08-06 18:19:40 +00:00
Alan Viverette
8a782c9de4 am db576e1d: am c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev 
* commit 'db576e1d0cead619164afacefdb6215194285a32':
  Update anchor background on the correct view in PopupWindow
 2015-08-06 18:02:47 +00:00
Alan Viverette
db576e1d0c 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:38 +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
74423ccf95 am aacc7978: am 41dfffb3: am db6a6a21: am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev 
* commit 'aacc797809e5bf2c02735cb3a7d92c5ccefb5116':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
 2015-08-06 17:19:53 +00:00
Dianne Hackborn
41dfffb357 am db6a6a21: am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev 
* commit 'db6a6a215e9f55b9413e18ca9c67aa3ef31bbefb':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
 2015-08-06 17:00:47 +00:00
Dianne Hackborn
db6a6a215e 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:53:56 +00:00
Chet Haase
ddc1598871 am f7d8577e: am 42c70645: am aed2e8ba: am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev 
* commit 'f7d8577ed048361ffac711a721acc69f83ab6e01':
  Avoid changing internal state of shared drawable
 2015-08-06 16:50:40 +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
Chet Haase
42c70645d2 am aed2e8ba: am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev 
* commit 'aed2e8baedd9cf3fb4472d4215dc9b15da390a94':
  Avoid changing internal state of shared drawable
 2015-08-06 16:38:02 +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
aed2e8baed 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:33 +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
a544ea9b97 am 351c3bd1: am 54f1ffcd: am 2d1cf627: am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev 
* commit '351c3bd16b4c23d267f3dc2c00a555a82fd7e77e':
  Update documentation of DevicePolicyManager intents.
 2015-08-06 16:14:42 +00:00
Alan Treadway
54f1ffcdd6 am 2d1cf627: am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev 
* commit '2d1cf6278587224125da298aba42044aff1d5d8c':
  Update documentation of DevicePolicyManager intents.
 2015-08-06 15:59:43 +00:00
Alan Treadway
2d1cf62785 am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev 
* commit '190a88d2ce6a08d0eb98d774b81e5ca6b82b45f8':
  Update documentation of DevicePolicyManager intents.
 2015-08-06 15:51:04 +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
d239bb5ebd am a7b3694c: am b9bdde13: am 1663c75f: am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev 
* commit 'a7b3694c56dfc85a4edbb868815ee3dd0998a5b9':
  Make the NullVibrator really null.
 2015-08-06 14:18:50 +00:00
Julia Reynolds
5452a0df66 am 4b74d669: am 48d146c9: am c694ab32: am a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev 
* commit '4b74d6693e2ea7248de79332a020672ece19b100':
  Store ringer mode on entering DND mode so it can be restored on exit.
 2015-08-06 14:06:19 +00:00
Michael Wright
b9bdde13f5 am 1663c75f: am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev 
* commit '1663c75fa7e83547f3aefc6128f2b90776de5639':
  Make the NullVibrator really null.
 2015-08-06 14:05:21 +00:00
Michael Wright
1663c75fa7 am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev 
* commit 'd5a6df6d228036258d616245502c1a4f85ba4b2e':
  Make the NullVibrator really null.
 2015-08-06 13:58:05 +00:00
Julia Reynolds
48d146c9d6 am c694ab32: am a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev 
* commit 'c694ab32846da54f7fc00dea42ded9b98c6f148f':
  Store ringer mode on entering DND mode so it can be restored on exit.
 2015-08-06 13:54:43 +00:00
Michael Wright
d5a6df6d22 Merge "Make the NullVibrator really null." into mnc-dev 2015-08-06 13:52:34 +00:00
Julia Reynolds
c694ab3284 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:41 +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
e07e684f43 am 469840aa: am c3213285: am 072097bd: am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev 
* commit '469840aa48e30d96a1f5329d38e177ab18b924d9':
  Keep OverScroller.SplineOverScroller state consistent.
 2015-08-05 20:07:54 +00:00
Vladislav Kaznacheev
c32132853f am 072097bd: am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev 
* commit '072097bd3f2b685b4b21d415c2b70cbca9eb76fd':
  Keep OverScroller.SplineOverScroller state consistent.
 2015-08-05 19:48:39 +00:00
Vladislav Kaznacheev
072097bd3f am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev 
* commit '8cc00243423e22a36c518cd5ece97b45271ae5e8':
  Keep OverScroller.SplineOverScroller state consistent.
 2015-08-05 19:40:37 +00:00
Vladislav Kaznacheev
8cc0024342 Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev 2015-08-05 19:34:38 +00:00
Ajay Panicker
b3b9818537 am c89da1c7: am 1820dc06: am 106e4f4c: am cda6e878: Implement Bluetooth settings factory reset (2/5) 
* commit 'c89da1c70c3f202052f85ccca9145eda04817deb':
  Implement Bluetooth settings factory reset (2/5)
 2015-08-05 18:29:04 +00:00
Ajay Panicker
1820dc06a3 am 106e4f4c: am cda6e878: Implement Bluetooth settings factory reset (2/5) 
* commit '106e4f4ca06003ed2cf57bddb24f46a1142cdc49':
  Implement Bluetooth settings factory reset (2/5)
 2015-08-05 18:10:35 +00:00
Ajay Panicker
106e4f4ca0 am cda6e878: Implement Bluetooth settings factory reset (2/5) 
* commit 'cda6e878cd1b11e10c0b9b4b903b14e11586a963':
  Implement Bluetooth settings factory reset (2/5)
 2015-08-05 18:01:10 +00:00
Rubin Xu
9b5bd26ee1 am c0ad5751: am 6b6b9cd9: am 01496367: am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev 
* commit 'c0ad5751f895a1f76b8302b7fd068bd62a6058f3':
  Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
 2015-08-05 17:44:22 +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
Niels Egberts
d609d22eb5 am 3c204b61: am 8e4a16b8: am a02bd53e: am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev 
* commit '3c204b61759099cd51e08a5fbc460d03d383a1b1':
  NPE occured when trying to parcel voice features.
 2015-08-05 17:11:24 +00:00
Ian Pedowitz
2d7a9d373f am c3e4f31e: am 76b07705: am 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev 
* commit 'c3e4f31e9ba64f92e3f06a9ce401211c1c058859':
  Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
 2015-08-05 17:11:18 +00:00
Rubin Xu
6b6b9cd911 am 01496367: am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev 
* commit '0149636785a00eced7aeb97a6b5606c46582d05c':
  Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
 2015-08-05 17:09:00 +00:00
Rubin Xu
0149636785 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:58 +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
Niels Egberts
8e4a16b816 am a02bd53e: am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev 
* commit 'a02bd53edefa6868829602675c068926ef270c63':
  NPE occured when trying to parcel voice features.
 2015-08-05 16:55:26 +00:00
Ian Pedowitz
76b0770558 am 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev 
* commit '4d2eec1434f08667999b9cc51e6cf6f7146003e5':
  Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
 2015-08-05 16:55:22 +00:00
Niels Egberts
a02bd53ede 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:48:24 +00:00
Ian Pedowitz
4d2eec1434 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 16:48:18 +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
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
df5a661107 Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev 2015-08-05 14:34:13 +00:00