OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 1820dc06: am 106e4f4c: am cda6e878: Implement Bluetooth settings factory reset...
Ajay Panicker [Wed, 5 Aug 2015 18:20:12 +0000 (18:20 +0000)]
am 1820dc06: am 106e4f4c: am cda6e878: Implement Bluetooth settings factory reset (2/5)

* commit '1820dc06a3cd5ea81a88ba3bc799146b51937d89':
  Implement Bluetooth settings factory reset (2/5)

9 years agoam 106e4f4c: am cda6e878: Implement Bluetooth settings factory reset (2/5)
Ajay Panicker [Wed, 5 Aug 2015 18:10:35 +0000 (18:10 +0000)]
am 106e4f4c: am cda6e878: Implement Bluetooth settings factory reset (2/5)

* commit '106e4f4ca06003ed2cf57bddb24f46a1142cdc49':
  Implement Bluetooth settings factory reset (2/5)

9 years agoam 5082b180: am ffb72473: Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-dev
Tyler Gunn [Wed, 5 Aug 2015 18:09:50 +0000 (18:09 +0000)]
am 5082b180: am ffb72473: Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-dev

* commit '5082b180c6038fef37b6fcf227373f25d5f842d1':
  Remove EXTRA_CALL_HISTORY_INFO.

9 years agoam cda6e878: Implement Bluetooth settings factory reset (2/5)
Ajay Panicker [Wed, 5 Aug 2015 18:01:10 +0000 (18:01 +0000)]
am cda6e878: Implement Bluetooth settings factory reset (2/5)

* commit 'cda6e878cd1b11e10c0b9b4b903b14e11586a963':
  Implement Bluetooth settings factory reset (2/5)

9 years agoam ffb72473: Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-dev
Tyler Gunn [Wed, 5 Aug 2015 17:58:23 +0000 (17:58 +0000)]
am ffb72473: Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-dev

* commit 'ffb72473c67c13c75421f5df979404407ff01bb4':
  Remove EXTRA_CALL_HISTORY_INFO.

9 years agoam e7359b09: am ef7deb90: am e72377e1: Merge "Fix app ops regressions introduced...
Svetoslav Ganov [Wed, 5 Aug 2015 17:51:17 +0000 (17:51 +0000)]
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

9 years agoMerge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-dev
Tyler Gunn [Wed, 5 Aug 2015 17:47:14 +0000 (17:47 +0000)]
Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-dev

9 years agoam bf026e68: am b0e9e731: am bce3eb22: Merge "Fix incorrect default wifi power draw...
Mitchell Wills [Wed, 5 Aug 2015 17:44:39 +0000 (17:44 +0000)]
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

9 years agoam ef7deb90: am e72377e1: Merge "Fix app ops regressions introduced by the per UID...
Svetoslav Ganov [Wed, 5 Aug 2015 17:43:36 +0000 (17:43 +0000)]
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

9 years agoam 6b6b9cd9: am 01496367: am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_A...
Rubin Xu [Wed, 5 Aug 2015 17:39:08 +0000 (17:39 +0000)]
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

9 years agoam 84c1eb6d: am a29e0501: am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1...
Makoto Onuki [Wed, 5 Aug 2015 17:39:02 +0000 (17:39 +0000)]
am 84c1eb6d: am a29e0501: am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev

* commit '84c1eb6d24c73a47871cd1c0f5bfb9e0b69986d2':
  READ_SMS allows getLine1Number() [1/3]

9 years agoam e72377e1: Merge "Fix app ops regressions introduced by the per UID policy change...
Svetoslav Ganov [Wed, 5 Aug 2015 17:38:31 +0000 (17:38 +0000)]
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

9 years agoImplement Bluetooth settings factory reset (2/5)
Ajay Panicker [Tue, 28 Jul 2015 23:52:09 +0000 (16:52 -0700)]
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

9 years agoMerge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev
Svetoslav Ganov [Wed, 5 Aug 2015 17:22:42 +0000 (17:22 +0000)]
Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev

9 years agoam b0e9e731: am bce3eb22: Merge "Fix incorrect default wifi power draw values" into...
Mitchell Wills [Wed, 5 Aug 2015 17:20:04 +0000 (17:20 +0000)]
am b0e9e731: am bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev

* commit 'b0e9e731f284601fb6f544596d4c5973df111355':
  Fix incorrect default wifi power draw values

9 years agoam bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev
Mitchell Wills [Wed, 5 Aug 2015 17:09:22 +0000 (17:09 +0000)]
am bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev

* commit 'bce3eb22afcd57b7f1bdde26030f8c44bb885a4b':
  Fix incorrect default wifi power draw values

9 years agoam 01496367: am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_B...
Rubin Xu [Wed, 5 Aug 2015 17:09:00 +0000 (17:09 +0000)]
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

9 years agoam a29e0501: am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev
Makoto Onuki [Wed, 5 Aug 2015 17:08:56 +0000 (17:08 +0000)]
am a29e0501: am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev

* commit 'a29e05012db02c4ed87eb8c31c2138e966f742b5':
  READ_SMS allows getLine1Number() [1/3]

9 years agoam 8e4a16b8: am a02bd53e: am 6bdc4637: Merge "NPE occured when trying to parcel voice...
Niels Egberts [Wed, 5 Aug 2015 17:03:08 +0000 (17:03 +0000)]
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.

9 years agoam 76b07705: am 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUN...
Ian Pedowitz [Wed, 5 Aug 2015 17:03:02 +0000 (17:03 +0000)]
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""

9 years agoam ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into...
Rubin Xu [Wed, 5 Aug 2015 17:00:58 +0000 (17:00 +0000)]
am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev

* commit 'ab868effb7a54bc6a6b2d35412fe466c0adc7f55':
  Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE

9 years agoam 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev
Makoto Onuki [Wed, 5 Aug 2015 17:00:53 +0000 (17:00 +0000)]
am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev

* commit '86ee3a57e428b14023bc0bdbd6cb8f8bc206be74':
  READ_SMS allows getLine1Number() [1/3]

9 years agoMerge "Fix incorrect default wifi power draw values" into mnc-dev
Mitchell Wills [Wed, 5 Aug 2015 16:59:23 +0000 (16:59 +0000)]
Merge "Fix incorrect default wifi power draw values" into mnc-dev

9 years agoMerge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev
Rubin Xu [Wed, 5 Aug 2015 16:55:50 +0000 (16:55 +0000)]
Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev

9 years agoMerge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev
Makoto Onuki [Wed, 5 Aug 2015 16:55:35 +0000 (16:55 +0000)]
Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev

9 years agoam a02bd53e: am 6bdc4637: Merge "NPE occured when trying to parcel voice features...
Niels Egberts [Wed, 5 Aug 2015 16:55:26 +0000 (16:55 +0000)]
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.

9 years agoam 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission...
Ian Pedowitz [Wed, 5 Aug 2015 16:55:22 +0000 (16:55 +0000)]
am 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev

* commit '4d2eec1434f08667999b9cc51e6cf6f7146003e5':
  Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""

9 years agoam 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev
Niels Egberts [Wed, 5 Aug 2015 16:48:24 +0000 (16:48 +0000)]
am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev

* commit '6bdc4637d7ac1df86e9d745ac483987107a71282':
  NPE occured when trying to parcel voice features.

9 years agoam df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup...
Ian Pedowitz [Wed, 5 Aug 2015 16:48:18 +0000 (16:48 +0000)]
am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev

* commit 'df5a66110777554d5b163693ac8395d7c21c328f':
  Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""

9 years agoam c0d2e7a6: (-s ours) am e229337b: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 5 Aug 2015 16:35:35 +0000 (16:35 +0000)]
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

9 years agoam e229337b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 5 Aug 2015 16:28:59 +0000 (16:28 +0000)]
am e229337b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'e229337b34a92f99ed25f92479753e9dfd113a96':
  Import translations. DO NOT MERGE

9 years agoUpdate javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
Rubin Xu [Wed, 5 Aug 2015 15:29:13 +0000 (16:29 +0100)]
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

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 5 Aug 2015 16:19:53 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

9 years agoMerge "NPE occured when trying to parcel voice features." into mnc-dev
Niels Egberts [Wed, 5 Aug 2015 15:57:55 +0000 (15:57 +0000)]
Merge "NPE occured when trying to parcel voice features." into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Aug 2015 15:48:06 +0000 (10:48 -0500)]
Import translations. DO NOT MERGE

Change-Id: I8fe682739483119d031a29310670d8abfc81bedd
Auto-generated-cl: translation import

9 years agoNPE occured when trying to parcel voice features.
Niels Egberts [Wed, 5 Aug 2015 14:41:18 +0000 (15:41 +0100)]
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

9 years agoMerge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev
Ian Pedowitz [Wed, 5 Aug 2015 14:34:13 +0000 (14:34 +0000)]
Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev

9 years agoam 28739294: (-s ours) am 90b69615: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Aug 2015 14:26:06 +0000 (14:26 +0000)]
am 28739294: (-s ours) am 90b69615: (-s ours) Import translations. DO NOT MERGE

* commit '28739294c1020bde477a44bd42575d8c640ddc18':
  Import translations. DO NOT MERGE

9 years agoRevert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
Ian Pedowitz [Wed, 5 Aug 2015 14:23:43 +0000 (14:23 +0000)]
Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""

This reverts commit 845d14db9066c3262f270237b52e315aa71508b2.

Bug: 22942480
Bug: 22902898
Change-Id: If2d0e11594284414953c3dd45475fc7ba3366295

9 years agoam 90b69615: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Aug 2015 14:20:31 +0000 (14:20 +0000)]
am 90b69615: (-s ours) Import translations. DO NOT MERGE

* commit '90b69615706cee73363c3420e2d81a184f9acc07':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Aug 2015 13:53:22 +0000 (06:53 -0700)]
Import translations. DO NOT MERGE

Change-Id: I46c802cd1fbcb8dff8893a353b46a4717bfa1a41
Auto-generated-cl: translation import

9 years agoam 95297732: am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev
Paul Jensen [Wed, 5 Aug 2015 11:32:19 +0000 (11:32 +0000)]
am 95297732: am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev

* commit '952977322215b990f5aa6898bfaa40bb064545f4':
  Fix NOT_RESTRICTED network capability and enforce it.

9 years agoam 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev
Paul Jensen [Wed, 5 Aug 2015 11:24:18 +0000 (11:24 +0000)]
am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev

* commit '86e7d135acbdb0055de6a687817d44ac60603c9f':
  Fix NOT_RESTRICTED network capability and enforce it.

9 years agoresolved conflicts for merge of dbc4edcc to mnc-dr-dev
Paul Jensen [Wed, 5 Aug 2015 11:07:24 +0000 (07:07 -0400)]
resolved conflicts for merge of dbc4edcc to mnc-dr-dev

Change-Id: I3a8624b2b375e0d174983d7690082e0e6932c4de

9 years agoMerge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev
Paul Jensen [Wed, 5 Aug 2015 10:03:47 +0000 (10:03 +0000)]
Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev

9 years agoam 37b18434: am 815a6b6b: am 519adb50: Merge "Create a special CONSTRAINED font bucke...
Roozbeh Pournader [Wed, 5 Aug 2015 03:35:55 +0000 (03:35 +0000)]
am 37b18434: am 815a6b6b: am 519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev

* commit '37b1843417b1362530b51b1d5c5f8bda06a7c92e':
  Create a special CONSTRAINED font bucket in frameworks.

9 years agoam 815a6b6b: am 519adb50: Merge "Create a special CONSTRAINED font bucket in framewor...
Roozbeh Pournader [Wed, 5 Aug 2015 03:23:55 +0000 (03:23 +0000)]
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.

9 years agoam 519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into...
Roozbeh Pournader [Wed, 5 Aug 2015 03:16:35 +0000 (03:16 +0000)]
am 519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev

* commit '519adb50ebd45b8ecd1a8b8abbb975e35bb42974':
  Create a special CONSTRAINED font bucket in frameworks.

9 years agoMerge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev
Roozbeh Pournader [Wed, 5 Aug 2015 03:04:58 +0000 (03:04 +0000)]
Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev

9 years agoFix app ops regressions introduced by the per UID policy change
Svetoslav [Wed, 5 Aug 2015 02:03:40 +0000 (19:03 -0700)]
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

9 years agoam 97b46064: am 3832b13c: am 54cea234: Merge "Boot loop when SSID has non UTF-8 chara...
xin He [Wed, 5 Aug 2015 01:33:43 +0000 (01:33 +0000)]
am 97b46064: am 3832b13c: am 54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev

* commit '97b4606422afc43dcf93d0452325297a2ce70abd':
  Boot loop when SSID has non UTF-8 character in the name

9 years agoam 3832b13c: am 54cea234: Merge "Boot loop when SSID has non UTF-8 character in the...
xin He [Wed, 5 Aug 2015 01:27:12 +0000 (01:27 +0000)]
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

9 years agoam 54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" into...
xin He [Wed, 5 Aug 2015 01:18:06 +0000 (01:18 +0000)]
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

9 years agoMerge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev
xin He [Wed, 5 Aug 2015 01:10:34 +0000 (01:10 +0000)]
Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev

9 years agoam 229347ec: am c632313e: am 2094a702: Merge "Unregister the existing callback when...
Jae Seo [Wed, 5 Aug 2015 00:27:40 +0000 (00:27 +0000)]
am 229347ec: am c632313e: am 2094a702: Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev

* commit '229347ec319aedfc76aac4eca9b33e74814807ba':
  Unregister the existing callback when MediaProjection stops

9 years agoam c632313e: am 2094a702: Merge "Unregister the existing callback when MediaProjectio...
Jae Seo [Wed, 5 Aug 2015 00:21:53 +0000 (00:21 +0000)]
am c632313e: am 2094a702: Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev

* commit 'c632313e7294d191fb616bf53b1b9d99ef1ed24a':
  Unregister the existing callback when MediaProjection stops

9 years agoam 2094a702: Merge "Unregister the existing callback when MediaProjection stops"...
Jae Seo [Wed, 5 Aug 2015 00:14:13 +0000 (00:14 +0000)]
am 2094a702: Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev

* commit '2094a702b33f0bc4e1c22b85a8a6e8bc8988a079':
  Unregister the existing callback when MediaProjection stops

9 years agoMerge "Unregister the existing callback when MediaProjection stops" into mnc-dev
Jae Seo [Wed, 5 Aug 2015 00:07:11 +0000 (00:07 +0000)]
Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev

9 years agoam 026457a4: am 64e26348: am 0d616883: Merge "Fix moving of apps into legacy ASEC...
Jeff Sharkey [Tue, 4 Aug 2015 23:54:37 +0000 (23:54 +0000)]
am 026457a4: am 64e26348: am 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev

* commit '026457a41bf6c5373cba42004c4b5b0f57f54abd':
  Fix moving of apps into legacy ASEC.

9 years agoam 64e26348: am 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev
Jeff Sharkey [Tue, 4 Aug 2015 23:46:40 +0000 (23:46 +0000)]
am 64e26348: am 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev

* commit '64e26348bcb0f6282b71ff3577521d131f765a56':
  Fix moving of apps into legacy ASEC.

9 years agoam 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev
Jeff Sharkey [Tue, 4 Aug 2015 23:38:27 +0000 (23:38 +0000)]
am 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev

* commit '0d6168835a6114a9e346278e4613e9175a907fd3':
  Fix moving of apps into legacy ASEC.

9 years agoCreate a special CONSTRAINED font bucket in frameworks.
Roozbeh Pournader [Tue, 4 Aug 2015 17:17:08 +0000 (10:17 -0700)]
Create a special CONSTRAINED font bucket in frameworks.

This is a temporary font profile to get razor and razorg (Nexus 7,
2013 version). It's not tested thoroughly, and should not be used for
any other devices.

The CONSTRAINED profile removes Bamum, Lisu, Mandaic, Mongolian, New
Tai Lue, Syriac, Tibetan, and Vai fonts from razor[g] devices, and
switches the CJK fonts to the limited pre-Lollipop fonts.

Bug: 22929087
Change-Id: I58c1693ee45e54b429013029d236617834446811

9 years agoMerge "Fix moving of apps into legacy ASEC." into mnc-dev
Jeff Sharkey [Tue, 4 Aug 2015 23:27:43 +0000 (23:27 +0000)]
Merge "Fix moving of apps into legacy ASEC." into mnc-dev

9 years agoam c3080d78: am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null...
Filip Gruszczynski [Tue, 4 Aug 2015 23:27:22 +0000 (23:27 +0000)]
am c3080d78: am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev

* commit 'c3080d7855838bcbe070bddd083a5736687f130b':
  Make ResourceKey always use non-null configuration override.

9 years agoam 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration...
Filip Gruszczynski [Tue, 4 Aug 2015 23:18:47 +0000 (23:18 +0000)]
am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev

* commit '841d7b75176f4ba086751f12ac57e5420ce501d8':
  Make ResourceKey always use non-null configuration override.

9 years agoam 52d3312a: Merge "Make ResourceKey always use non-null configuration override....
Filip Gruszczynski [Tue, 4 Aug 2015 23:11:24 +0000 (23:11 +0000)]
am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev

* commit '52d3312abeafd988ecb2288896b74ba72c3e70c0':
  Make ResourceKey always use non-null configuration override.

9 years agoMerge "Make ResourceKey always use non-null configuration override." into mnc-dev
Filip Gruszczynski [Tue, 4 Aug 2015 23:02:19 +0000 (23:02 +0000)]
Merge "Make ResourceKey always use non-null configuration override." into mnc-dev

9 years agoMake ResourceKey always use non-null configuration override.
Filip Gruszczynski [Tue, 4 Aug 2015 21:46:33 +0000 (14:46 -0700)]
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

9 years agoam 992ae880: am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while...
Mitchell Wills [Tue, 4 Aug 2015 22:22:25 +0000 (22:22 +0000)]
am 992ae880: am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev

* commit '992ae880743a49331ea0ab666f4fe3c8617750db':
  Charge apps for wifi tx time while scanning

9 years agoam e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into...
Mitchell Wills [Tue, 4 Aug 2015 22:12:30 +0000 (22:12 +0000)]
am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev

* commit 'e8c888c41949c174f8cc244f8d705e675a2f3c30':
  Charge apps for wifi tx time while scanning

9 years agoam 1c53d91e: am 65b84a16: am 78b8d4aa: Mark missed calls as read in calllog restore...
Roshan Pius [Tue, 4 Aug 2015 22:02:41 +0000 (22:02 +0000)]
am 1c53d91e: am 65b84a16: am 78b8d4aa: Mark missed calls as read in calllog restore(2/2)

* commit '1c53d91e815fe281855a1ba5fa3944bcf67eba7c':
  Mark missed calls as read in calllog restore(2/2)

9 years agoam 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev
Mitchell Wills [Tue, 4 Aug 2015 22:02:24 +0000 (22:02 +0000)]
am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev

* commit '385dfd349ff773c499859ee44552995e9c25759c':
  Charge apps for wifi tx time while scanning

9 years agoam 65b84a16: am 78b8d4aa: Mark missed calls as read in calllog restore(2/2)
Roshan Pius [Tue, 4 Aug 2015 21:56:58 +0000 (21:56 +0000)]
am 65b84a16: am 78b8d4aa: Mark missed calls as read in calllog restore(2/2)

* commit '65b84a165239ea8e50b8a7129da7eb1ad4536308':
  Mark missed calls as read in calllog restore(2/2)

9 years agoMerge "Charge apps for wifi tx time while scanning" into mnc-dev
Mitchell Wills [Tue, 4 Aug 2015 21:55:46 +0000 (21:55 +0000)]
Merge "Charge apps for wifi tx time while scanning" into mnc-dev

9 years agoam 78b8d4aa: Mark missed calls as read in calllog restore(2/2)
Roshan Pius [Tue, 4 Aug 2015 21:48:38 +0000 (21:48 +0000)]
am 78b8d4aa: Mark missed calls as read in calllog restore(2/2)

* commit '78b8d4aa99ce866caacf291a446837416fa07bd7':
  Mark missed calls as read in calllog restore(2/2)

9 years agoCharge apps for wifi tx time while scanning
Mitchell Wills [Thu, 30 Jul 2015 00:47:44 +0000 (17:47 -0700)]
Charge apps for wifi tx time while scanning

Bug: 22955562
Change-Id: Ie2c6ab65e7b592272e1cad120ac606fcfd6ea677

9 years agoam 0ca9e2df: am 4032c94d: am fc5a4bf0: Merge "AudioService: check for audio device...
Jean-Michel Trivi [Tue, 4 Aug 2015 21:16:49 +0000 (21:16 +0000)]
am 0ca9e2df: am 4032c94d: am fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev

* commit '0ca9e2dffb60781b4bdfa2a4a012f7ee2afa02b8':
  AudioService: check for audio device connection success

9 years agoMark missed calls as read in calllog restore(2/2)
Roshan Pius [Tue, 4 Aug 2015 20:23:03 +0000 (13:23 -0700)]
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

9 years agoam 4032c94d: am fc5a4bf0: Merge "AudioService: check for audio device connection...
Jean-Michel Trivi [Tue, 4 Aug 2015 21:06:32 +0000 (21:06 +0000)]
am 4032c94d: am fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev

* commit '4032c94d579bc63387f30fd5a3e41083c2bd09fb':
  AudioService: check for audio device connection success

9 years agoam b381d697: am 073bfb9b: am ce68917c: Merge "Ensure per package and per UID state...
Svetoslav Ganov [Tue, 4 Aug 2015 21:06:13 +0000 (21:06 +0000)]
am b381d697: am 073bfb9b: am ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev

* commit 'b381d697310c14cef50e0e80bebd15a97b8e9c84':
  Ensure per package and per UID state share same package settings.

9 years agoam 9aebdb4c: am d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when window...
Yohei Yukawa [Tue, 4 Aug 2015 21:06:06 +0000 (21:06 +0000)]
am 9aebdb4c: am d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev

* commit '9aebdb4c39bd958f0a568539ea503b2da494802e':
  Revert "Do not forceLayout when window is resized"

9 years agoam 2eafb06f: am b2c71814: am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regres...
Nick Kralevich [Tue, 4 Aug 2015 21:05:57 +0000 (21:05 +0000)]
am 2eafb06f: am b2c71814: am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev

* commit '2eafb06f5d618015e0bbcd31f8537664914d749d':
  UsbDeviceManager: fix b/21429947 regression (try #2)

9 years agoam fc5a4bf0: Merge "AudioService: check for audio device connection success" into...
Jean-Michel Trivi [Tue, 4 Aug 2015 20:55:57 +0000 (20:55 +0000)]
am fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev

* commit 'fc5a4bf0e1520bf3acd75226d760b8e1d7cdd59f':
  AudioService: check for audio device connection success

9 years agoam 073bfb9b: am ce68917c: Merge "Ensure per package and per UID state share same...
Svetoslav Ganov [Tue, 4 Aug 2015 20:54:52 +0000 (20:54 +0000)]
am 073bfb9b: am ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev

* commit '073bfb9bec7bc407c50a23a2317852cb0d69599b':
  Ensure per package and per UID state share same package settings.

9 years agoam d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized...
Yohei Yukawa [Tue, 4 Aug 2015 20:54:48 +0000 (20:54 +0000)]
am d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev

* commit 'd7d14033af438b88053454e7d73c1689eaa77c35':
  Revert "Do not forceLayout when window is resized"

9 years agoam b2c71814: am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try...
Nick Kralevich [Tue, 4 Aug 2015 20:54:44 +0000 (20:54 +0000)]
am b2c71814: am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev

* commit 'b2c718146b1be18942bc5d76be68e0d437cbbe8b':
  UsbDeviceManager: fix b/21429947 regression (try #2)

9 years agoMerge "AudioService: check for audio device connection success" into mnc-dev
Jean-Michel Trivi [Tue, 4 Aug 2015 20:45:18 +0000 (20:45 +0000)]
Merge "AudioService: check for audio device connection success" into mnc-dev

9 years agoam ce68917c: Merge "Ensure per package and per UID state share same package settings...
Svetoslav Ganov [Tue, 4 Aug 2015 20:40:45 +0000 (20:40 +0000)]
am ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev

* commit 'ce68917c849548d80d9aca14f262d22d9c47c3dc':
  Ensure per package and per UID state share same package settings.

9 years agoam 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev
Yohei Yukawa [Tue, 4 Aug 2015 20:40:41 +0000 (20:40 +0000)]
am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev

* commit '2d34a8b7181635c0ff0b1f2390d70e3ac6960f00':
  Revert "Do not forceLayout when window is resized"

9 years agoam 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev
Nick Kralevich [Tue, 4 Aug 2015 20:40:35 +0000 (20:40 +0000)]
am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev

* commit '97b68bbe7180ca15ab10d6f65bbdac6c7e64885b':
  UsbDeviceManager: fix b/21429947 regression (try #2)

9 years agoUnregister the existing callback when MediaProjection stops
Jae Seo [Tue, 4 Aug 2015 18:12:13 +0000 (11:12 -0700)]
Unregister the existing callback when MediaProjection stops

Also removed the unnecessary lock in binderDied.

Bug: 22812934
Change-Id: Ief8856276dbd45a4afa632e51df18bd7d60e6bb1

9 years agoam 3adc6671: Merge "Fix doc typo for default wearable notification size." into cw...
Paul Soulos [Tue, 4 Aug 2015 20:21:59 +0000 (20:21 +0000)]
am 3adc6671: Merge "Fix doc typo for default wearable notification size." into cw-e-dev

* commit '3adc6671e965353a946ce77ecdf1ac041b607ccd':
  Fix doc typo for default wearable notification size.

9 years agoMerge "Ensure per package and per UID state share same package settings." into mnc-dev
Svetoslav Ganov [Tue, 4 Aug 2015 20:21:44 +0000 (20:21 +0000)]
Merge "Ensure per package and per UID state share same package settings." into mnc-dev

9 years agoMerge "Fix doc typo for default wearable notification size." into cw-e-dev
Paul Soulos [Tue, 4 Aug 2015 20:13:41 +0000 (20:13 +0000)]
Merge "Fix doc typo for default wearable notification size." into cw-e-dev

9 years agoam e28c5d62: am a975a844: am 70e5db94: Merge "Fix crash in kModeProcessNoContext...
John Reck [Tue, 4 Aug 2015 20:03:26 +0000 (20:03 +0000)]
am e28c5d62: am a975a844: am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev

* commit 'e28c5d62aad1d14901ccfe40e5177f5794c42f2b':
  Fix crash in kModeProcessNoContext

9 years agoam a975a844: am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev
John Reck [Tue, 4 Aug 2015 19:54:45 +0000 (19:54 +0000)]
am a975a844: am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev

* commit 'a975a84498014526d665f3bf7d0a5387f6e8a96b':
  Fix crash in kModeProcessNoContext

9 years agoMerge "Revert "Do not forceLayout when window is resized"" into mnc-dev
Yohei Yukawa [Tue, 4 Aug 2015 19:51:20 +0000 (19:51 +0000)]
Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev

9 years agoam 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev
John Reck [Tue, 4 Aug 2015 19:48:30 +0000 (19:48 +0000)]
am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev

* commit '70e5db9413f82bf1f000bd99b3d2dbecf6e4ab04':
  Fix crash in kModeProcessNoContext

9 years agoMerge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev
Nick Kralevich [Tue, 4 Aug 2015 19:46:06 +0000 (19:46 +0000)]
Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev

9 years agoMerge "Fix crash in kModeProcessNoContext" into mnc-dev
John Reck [Tue, 4 Aug 2015 19:38:15 +0000 (19:38 +0000)]
Merge "Fix crash in kModeProcessNoContext" into mnc-dev