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

202915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Burk
881cd15519 Merge "MidiManager: use ConcurrentHashMap" into mnc-dev 2015-08-05 19:43:21 +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
Yohei Yukawa
524e2f9c76 am 721a1fcd: am a512415e: am db221acc: Merge "Reduce log spam for the ease of debugging Bug 22857361." into mnc-dev 
* commit '721a1fcd88a4e1b3eeb11c1c6f4739abe4e6f315':
  Reduce log spam for the ease of debugging Bug 22857361.
 2015-08-05 18:20:18 +00:00
Ajay Panicker
c89da1c70c am 1820dc06: am 106e4f4c: am cda6e878: Implement Bluetooth settings factory reset (2/5) 
* commit '1820dc06a3cd5ea81a88ba3bc799146b51937d89':
  Implement Bluetooth settings factory reset (2/5)
 2015-08-05 18:20:12 +00:00
Yohei Yukawa
721a1fcd88 am a512415e: am db221acc: Merge "Reduce log spam for the ease of debugging Bug 22857361." into mnc-dev 
* commit 'a512415e13def82532e89fa763f3c8b5ce8bcc7c':
  Reduce log spam for the ease of debugging Bug 22857361.
 2015-08-05 18:16:33 +00:00
Amit Mahajan
69b55b5f03 Removing tethering overlay for mcc202-mnc05 (VF Greece). 
Bug: 22942869
Change-Id: I1d80ab3a66f7e1cd8e497b0d4236f80b0a126228
 2015-08-05 11:11:56 -07: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
Tyler Gunn
4bd3b248d5 am 5082b180: am ffb72473: Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-dev 
* commit '5082b180c6038fef37b6fcf227373f25d5f842d1':
  Remove EXTRA_CALL_HISTORY_INFO.
 2015-08-05 18:09:50 +00:00
Yohei Yukawa
a512415e13 am db221acc: Merge "Reduce log spam for the ease of debugging Bug 22857361." into mnc-dev 
* commit 'db221acce269245d630e8eb456501c5c6241447b':
  Reduce log spam for the ease of debugging Bug 22857361.
 2015-08-05 18:07:16 +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
Yohei Yukawa
db221acce2 Merge "Reduce log spam for the ease of debugging Bug 22857361." into mnc-dev 2015-08-05 17:59:23 +00:00
Tyler Gunn
5082b180c6 am ffb72473: Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-dev 
* commit 'ffb72473c67c13c75421f5df979404407ff01bb4':
  Remove EXTRA_CALL_HISTORY_INFO.
 2015-08-05 17:58:23 +00:00
Svetoslav Ganov
ac96d3a8ca am e7359b09: am ef7deb90: am e72377e1: Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev 
* commit 'e7359b09c7ab50fa9d92f0df3dddecd8d0111682':
  Fix app ops regressions introduced by the per UID policy change
 2015-08-05 17:51:17 +00:00
Andres Morales
c5548c02fe [UserManager] expose method to retrieve credential owner 
Certain operations (like ConfirmCredential) can be invoked
in the context of a profile, in which case the calling code
needs to know under what profile the credential is registered.

Expose a centralized location for this information for Settings
and GateKeeper to consume.

Bug: 22257554
Change-Id: Iffe4f6a254f52d1269b9287edabcf6efa515d9d2
 2015-08-05 10:50:05 -07:00
Tyler Gunn
ffb72473c6 Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-dev 2015-08-05 17:47:14 +00:00
Mitchell Wills
c439c236f1 am bf026e68: am b0e9e731: am bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev 
* commit 'bf026e68d3fc11a4d0ba68429c8fc2d75e62f2ff':
  Fix incorrect default wifi power draw values
 2015-08-05 17:44:39 +00:00
Svetoslav Ganov
e7359b09c7 am ef7deb90: am e72377e1: Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev 
* commit 'ef7deb90ac000b5977208e965e0bd84e247140e9':
  Fix app ops regressions introduced by the per UID policy change
 2015-08-05 17:43:36 +00:00
Rubin Xu
c0ad5751f8 am 6b6b9cd9: am 01496367: am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev 
* commit '6b6b9cd911104020e8af2250fd531d2ccc344c69':
  Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
 2015-08-05 17:39:08 +00:00
Makoto Onuki
ff1e7ad9d0 am 84c1eb6d: am a29e0501: am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev 
* commit '84c1eb6d24c73a47871cd1c0f5bfb9e0b69986d2':
  READ_SMS allows getLine1Number() [1/3]
 2015-08-05 17:39:02 +00:00
Svetoslav Ganov
ef7deb90ac am e72377e1: Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev 
* commit 'e72377e17a837acbe1e537ac737731f6b869fe1e':
  Fix app ops regressions introduced by the per UID policy change
 2015-08-05 17:38:31 +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
Svetoslav Ganov
e72377e17a Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev 2015-08-05 17:22:42 +00:00
Mitchell Wills
bf026e68d3 am b0e9e731: am bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev 
* commit 'b0e9e731f284601fb6f544596d4c5973df111355':
  Fix incorrect default wifi power draw values
 2015-08-05 17:20:04 +00:00
Mitchell Wills
b0e9e731f2 am bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev 
* commit 'bce3eb22afcd57b7f1bdde26030f8c44bb885a4b':
  Fix incorrect default wifi power draw values
 2015-08-05 17:09:22 +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
Makoto Onuki
84c1eb6d24 am a29e0501: am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev 
* commit 'a29e05012db02c4ed87eb8c31c2138e966f742b5':
  READ_SMS allows getLine1Number() [1/3]
 2015-08-05 17:08:56 +00:00
Niels Egberts
3c204b6175 am 8e4a16b8: am a02bd53e: am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev 
* commit '8e4a16b81623a21abe02898c172d9201567ff193':
  NPE occured when trying to parcel voice features.
 2015-08-05 17:03:08 +00:00
Ian Pedowitz
c3e4f31e9b am 76b07705: am 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev 
* commit '76b07705585fbe7bf8b744b09ac9f8aa4c8c9b5f':
  Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
 2015-08-05 17:03:02 +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
Makoto Onuki
a29e05012d am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev 
* commit '86ee3a57e428b14023bc0bdbd6cb8f8bc206be74':
  READ_SMS allows getLine1Number() [1/3]
 2015-08-05 17:00:53 +00:00
Mitchell Wills
bce3eb22af Merge "Fix incorrect default wifi power draw values" into mnc-dev 2015-08-05 16:59:23 +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
Makoto Onuki
86ee3a57e4 Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev 2015-08-05 16:55:35 +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
Geoff Mendal
af0afe815e am c0d2e7a6: (-s ours) am e229337b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'c0d2e7a6fb294fcf27039ea0157fbbde17a9b1a1':
  Import translations. DO NOT MERGE
 2015-08-05 16:35:35 +00:00
Geoff Mendal
c0d2e7a6fb am e229337b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'e229337b34a92f99ed25f92479753e9dfd113a96':
  Import translations. DO NOT MERGE
 2015-08-05 16:28:59 +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
Geoff Mendal
e229337b34 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-05 16:19:53 +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
Geoff Mendal
f5262e5215 Import translations. DO NOT MERGE 
Change-Id: I8fe682739483119d031a29310670d8abfc81bedd
Auto-generated-cl: translation import
 2015-08-05 10:48:06 -05:00
Paul McLean
3115960bde Consider channel index masks when calculating channel counts. 
Bug: 22874806
Change-Id: I04b74f5939bb81350d9e37b9629f8bbc242bffe7
 2015-08-05 09:03:51 -06: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
Geoff Mendal
8ccb29be62 am 28739294: (-s ours) am 90b69615: (-s ours) Import translations. DO NOT MERGE 
* commit '28739294c1020bde477a44bd42575d8c640ddc18':
  Import translations. DO NOT MERGE
 2015-08-05 14:26:06 +00:00
Ian Pedowitz
6cc066df7a Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup"" 
This reverts commit 845d14db9066c3262f270237b52e315aa71508b2.

Bug: 22942480
Bug: 22902898
Change-Id: If2d0e11594284414953c3dd45475fc7ba3366295
 2015-08-05 14:25:15 +00:00
Geoff Mendal
28739294c1 am 90b69615: (-s ours) Import translations. DO NOT MERGE 
* commit '90b69615706cee73363c3420e2d81a184f9acc07':
  Import translations. DO NOT MERGE
 2015-08-05 14:20:31 +00:00