drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
202,876 Commits 1 Branch 0 Tags
Commit Graph

202876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Treadway
351c3bd16b am 54f1ffcd: am 2d1cf627: am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev 
* commit '54f1ffcdd69ebc63d5f0d02e963b9ee7f7277786':
  Update documentation of DevicePolicyManager intents.
 2015-08-06 16:06:40 +00:00
Paul McLean
8b2562b14c Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test. 
Bug: 22792346
Change-Id: I8a10eb68368ede4baa0d2fd0d71cfff2fced4b75
 2015-08-06 10:03:13 -06: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
a7b3694c56 am b9bdde13: am 1663c75f: am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev 
* commit 'b9bdde13f50af73597e5b8a951da8698ee3f8fae':
  Make the NullVibrator really null.
 2015-08-06 14:14:21 +00:00
Michael Wright
0126d457d6 am 43a95cf1: am 44a14ef7: am eb7e3d7e: Merge "Don\'t dispatch when non-interactive and the display is off." into mnc-dev 
* commit '43a95cf1cdf5cd62b81af3222d194a0873ad6933':
  Don't dispatch when non-interactive and the display is off.
 2015-08-06 14:14:15 +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
43a95cf1cd am 44a14ef7: am eb7e3d7e: Merge "Don\'t dispatch when non-interactive and the display is off." into mnc-dev 
* commit '44a14ef7b4b5e85bb79c954f99929ec309c42c2e':
  Don't dispatch when non-interactive and the display is off.
 2015-08-06 14:05:17 +00:00
Julia Reynolds
4b74d6693e 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 '48d146c9d66abd3002a8bc6b7245e4c34b6fcff5':
  Store ringer mode on entering DND mode so it can be restored on exit.
 2015-08-06 14:01:40 +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
Michael Wright
44a14ef7b4 am eb7e3d7e: Merge "Don\'t dispatch when non-interactive and the display is off." into mnc-dev 
* commit 'eb7e3d7e456177f7848834759b9a7f6f78a05f7a':
  Don't dispatch when non-interactive and the display is off.
 2015-08-06 13:58:01 +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
Michael Wright
eb7e3d7e45 Merge "Don't dispatch when non-interactive and the display is off." into mnc-dev 2015-08-06 13:50:37 +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
Geoff Mendal
ecbd1cef9c am 511cf5b8: (-s ours) am 227d704f: (-s ours) am 375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '511cf5b88230910bac312f160e289650da896253':
  Import translations. DO NOT MERGE
 2015-08-06 04:36:41 +00:00
Geoff Mendal
511cf5b882 am 227d704f: (-s ours) am 375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '227d704f64cb7783b8626770ddbbfb151c843f99':
  Import translations. DO NOT MERGE
 2015-08-06 04:29:54 +00:00
Geoff Mendal
227d704f64 am 375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '375c792c176be43720da47db2cfced23613f537c':
  Import translations. DO NOT MERGE
 2015-08-06 04:20:37 +00:00
Geoff Mendal
375c792c17 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-08-06 04:12:38 +00:00
Mitchell Wills
0b09eefa35 am e69acd7a: am 104999b9: am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev 
* commit 'e69acd7a456fb97d7c816629dedb42026eabdd2e':
  Pass connection configuration when setting wifi info
 2015-08-06 02:45:46 +00:00
Amit Mahajan
b7c419919f am e992c927: am 89718b2b: am be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev 
* commit 'e992c927ebba4bed96f86388f1601e3cc3c7c9e3':
  Removing tethering overlay for mcc202-mnc05 (VF Greece).
 2015-08-06 02:40:05 +00:00
Jim Miller
4a66bbf7fd am 5f96eb0c: am 6fdb85d3: am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev 
* commit '5f96eb0caf6db51751b2af6404c98037067ce29d':
  Disable fingerprint when remotely reset by DPM
 2015-08-06 02:40:00 +00:00
Yorke Lee
e80dbaebd3 am 7be1e286: am cac65feb: am f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev 
* commit '7be1e2864136e87ad473f35e54a6795c4a58df8d':
  Correctly hide setConnectionService
 2015-08-06 02:39:54 +00:00
Deepanshu Gupta
0889fd2959 am 0e0d254c: am c34288be: am 2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev 
* commit '0e0d254c4ae1a744ebec1af70c11777d4d2f4525':
  Make getInt in BridgeTypedArray accept empty String.
  Fix layout mirroring.
 2015-08-06 02:39:48 +00:00
Mitchell Wills
e69acd7a45 am 104999b9: am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev 
* commit '104999b957440251610dc31939938ef0c85ab23f':
  Pass connection configuration when setting wifi info
 2015-08-06 02:37:19 +00:00
Mitchell Wills
104999b957 am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev 
* commit 'd14c48444a40fa2f964461e2f1317bcc3e256295':
  Pass connection configuration when setting wifi info
 2015-08-06 02:29:19 +00:00
Mitchell Wills
d14c48444a Merge "Pass connection configuration when setting wifi info" into mnc-dev 2015-08-06 02:23:44 +00:00
Svetoslav
0e62952aad Pregrant unrevokable storage permission to the CertInstaller 
bug:22988119

Change-Id: I310aa7149f67a7918cecfda13c69ab91c7c6e1a8
 2015-08-05 19:14:51 -07:00
Amit Mahajan
e992c927eb am 89718b2b: am be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev 
* commit '89718b2bf8f0449b122bf1c8aba039c6a0575c21':
  Removing tethering overlay for mcc202-mnc05 (VF Greece).
 2015-08-06 01:57:58 +00:00
Jim Miller
5f96eb0caf am 6fdb85d3: am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev 
* commit '6fdb85d383007e7d68895195d6347840276abeab':
  Disable fingerprint when remotely reset by DPM
 2015-08-06 01:57:54 +00:00
Yorke Lee
7be1e28641 am cac65feb: am f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev 
* commit 'cac65febb7bf50f0bc03d897ebbafa8347c0de31':
  Correctly hide setConnectionService
 2015-08-06 01:57:49 +00:00
Deepanshu Gupta
0e0d254c4a am c34288be: am 2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev 
* commit 'c34288be586028f949686e9a4fe7b84207bf2a6d':
  Make getInt in BridgeTypedArray accept empty String.
  Fix layout mirroring.
 2015-08-06 01:57:46 +00:00
Amit Mahajan
89718b2bf8 am be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev 
* commit 'be948f5a9f519210c5522060ec9ee3bc77eb077e':
  Removing tethering overlay for mcc202-mnc05 (VF Greece).
 2015-08-06 01:43:18 +00:00
Jim Miller
6fdb85d383 am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev 
* commit '120fc2c74eb290e06cddf1b52d363338f940c612':
  Disable fingerprint when remotely reset by DPM
 2015-08-06 01:43:13 +00:00
Yorke Lee
cac65febb7 am f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev 
* commit 'f0affc6d46849e844bec9ddc755ffae0042e443f':
  Correctly hide setConnectionService
 2015-08-06 01:43:05 +00:00
Deepanshu Gupta
c34288be58 am 2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev 
* commit '2c1a22d91607e18c7618e79ab026d3c5c4ce8949':
  Make getInt in BridgeTypedArray accept empty String.
  Fix layout mirroring.
 2015-08-06 01:42:43 +00:00
Geoff Mendal
f71c108b3c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 22842106
Change-Id: I473bc0dc200e1eec3bd0f907526fcf808ee86e36
 2015-08-05 17:54:19 -07:00
Tim Murray
34f4e88d7e am ffd8889a: am f76806a9: Merge "Add boost to increase the load on newly-forked zygote processes." into mnc-dr-dev 
* commit 'ffd8889a96db0dadf01f6dfcd9393910d491fb91':
  Add boost to increase the load on newly-forked zygote processes.
 2015-08-05 23:26:16 +00:00
Tim Murray
ffd8889a96 am f76806a9: Merge "Add boost to increase the load on newly-forked zygote processes." into mnc-dr-dev 
* commit 'f76806a9c0ddc8dd234ff746a52b74b19e7c2c12':
  Add boost to increase the load on newly-forked zygote processes.
 2015-08-05 23:20:45 +00:00
Tim Murray
f76806a9c0 Merge "Add boost to increase the load on newly-forked zygote processes." into mnc-dr-dev 2015-08-05 23:10:50 +00:00
Amit Mahajan
be948f5a9f Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev 2015-08-05 23:09:58 +00:00
Jim Miller
120fc2c74e Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev 2015-08-05 22:47:57 +00:00
Mitchell Wills
5a42db2e9c Pass connection configuration when setting wifi info 
This allows the both the ssid and connection info to be verified when
updating wifi info.

Bug: 22797622
Change-Id: I82d771a299e17469683516c6b1077cb260981812
 2015-08-05 15:39:19 -07:00
Yorke Lee
f0affc6d46 Merge "Correctly hide setConnectionService" into mnc-dev 2015-08-05 22:13:07 +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
Tim Murray
6d43a861d0 Add boost to increase the load on newly-forked zygote processes. 
Makes it more likely for app launches to end up on a large core in
an HMP environment.

bug 21915482

Change-Id: Ieac192a4bc1237dd03b9492fcad3a78de5510a58
 2015-08-05 14:32:44 -07:00