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

199610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Geoff Mendal
90b6961570 Import translations. DO NOT MERGE 
Change-Id: I46c802cd1fbcb8dff8893a353b46a4717bfa1a41
Auto-generated-cl: translation import
 2015-08-05 06:53:22 -07: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
9529773222 am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev 
* commit '86e7d135acbdb0055de6a687817d44ac60603c9f':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-08-05 11:24:18 +00:00
Paul Jensen
86e7d135ac resolved conflicts for merge of dbc4edcc to mnc-dr-dev 
Change-Id: I3a8624b2b375e0d174983d7690082e0e6932c4de
 2015-08-05 07:07:24 -04:00
Paul Jensen
dbc4edccfc Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev 2015-08-05 10:03:47 +00:00
Yohei Yukawa
df5af484f8 Reduce log spam for the ease of debugging Bug 22857361. 
Now InputMethodManagerService generates the following log
    Couldn't create dir.: /data/system/inputmethod
not only when it fails to create the directory but also when
/data/system/inputmethod already exists, which makes it
difficult for us to figure out the root cause of boot failure
on emulator environments (Bug 22857361).

With this CL, IMMS no longer shows the message when the
directory already exists.  Basically this is no risk change,
which changes only the condition to show the logging message.

Bug: 22857361
Change-Id: I09aaf501b19845c8309b09b57c23077f1757cd1a
 2015-08-04 22:13:28 -07:00
Roozbeh Pournader
37b1843417 am 815a6b6b: am 519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev 
* commit '815a6b6bdf400413057c83fa0ee63db749785d85':
  Create a special CONSTRAINED font bucket in frameworks.
 2015-08-05 03:23:55 +00:00
Roozbeh Pournader
815a6b6bdf am 519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev 
* commit '519adb50ebd45b8ecd1a8b8abbb975e35bb42974':
  Create a special CONSTRAINED font bucket in frameworks.
 2015-08-05 03:16:35 +00:00
Roozbeh Pournader
519adb50eb Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev 2015-08-05 03:04:58 +00:00
Svetoslav
215b44a1c2 Fix app ops regressions introduced by the per UID policy change 
1. Add a missing statement in the parsing code

2. Notify for all packages on UID ap op policy change

bug:22957162

Change-Id: Ic2bd5d07ef52be207e66b63ffe45fd8a456eb5a8
 2015-08-04 19:06:41 -07:00
xin He
97b4606422 am 3832b13c: am 54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev 
* commit '3832b13c1fe316be416bacb1f1badc5e67f44b4e':
  Boot loop when SSID has non UTF-8 character in the name
 2015-08-05 01:27:12 +00:00
xin He
3832b13c1f am 54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev 
* commit '54cea23479b6c44c5ac40b4f34edf29df311bb91':
  Boot loop when SSID has non UTF-8 character in the name
 2015-08-05 01:18:06 +00:00
xin He
54cea23479 Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev 2015-08-05 01:10:34 +00:00
Jae Seo
229347ec31 am c632313e: am 2094a702: Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev 
* commit 'c632313e7294d191fb616bf53b1b9d99ef1ed24a':
  Unregister the existing callback when MediaProjection stops
 2015-08-05 00:21:53 +00:00
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
026457a41b am 64e26348: am 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev 
* commit '64e26348bcb0f6282b71ff3577521d131f765a56':
  Fix moving of apps into legacy ASEC.
 2015-08-04 23:46:40 +00:00