OSDN Git Service

android-x86/frameworks-base.git
8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a...
Dan Sandler [Sat, 24 Oct 2015 00:33:48 +0000 (00:33 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a  -s ours am: 410bea181b am: 511357c39b
am: 7e16b2e8f5  -s ours

* commit '7e16b2e8f5b74d29711d330f6982d8ed12c3f4db':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a...
Dan Sandler [Sat, 24 Oct 2015 00:15:49 +0000 (00:15 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a  -s ours am: 410bea181b
am: 511357c39b

* commit '511357c39b058b0d03beb175c1c35990729ee3d0':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e
Dan Sandler [Sat, 24 Oct 2015 00:04:17 +0000 (00:04 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e
am: 6c3186ea07  -s ours

* commit '6c3186ea07a735d84e9a33e9864366b01f1f4c86':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a...
Dan Sandler [Sat, 24 Oct 2015 00:04:06 +0000 (00:04 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a  -s ours
am: 410bea181b

* commit '410bea181b229adef7a2c1a9308379eead260706':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77
Dan Sandler [Fri, 23 Oct 2015 23:49:56 +0000 (23:49 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77
am: 6026b5b17e

* commit '6026b5b17e786c180909d8fe5f6747e446e1d365':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3
Dan Sandler [Fri, 23 Oct 2015 23:49:54 +0000 (23:49 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3
am: b1de85487a  -s ours

* commit 'b1de85487af1726c3d9e80d78bd643f550d9f3a4':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Fri, 23 Oct 2015 23:39:50 +0000 (23:39 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
am: 51c2619c77

* commit '51c2619c7706575a171cf29819db14e91b815a62':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Fri, 23 Oct 2015 23:39:22 +0000 (23:39 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
am: 1044e162c3

* commit '1044e162c3dc4169b79112fc1a2de14757bca8c3':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Tue, 20 Oct 2015 23:01:27 +0000 (16:01 -0700)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE

Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

Bug: 19121797
(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)

Change-Id: I14d9fb54521dc6d60822e7c683e4e92fd62cdc6a

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Tue, 20 Oct 2015 23:01:27 +0000 (16:01 -0700)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE

Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)

Bug: 19121797
Change-Id: I7a5c12b371b735c756ca5a3e8716c385fb3fbfe9

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Tue, 20 Oct 2015 23:01:27 +0000 (16:01 -0700)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE

Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

Bug: 19121797
Change-Id: I52b69b2029439d42163ead5dc8748889b4f61934
(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)

8 years agoMerge "Docs only change: update build version docs." into mnc-dev
Dianne Hackborn [Thu, 15 Oct 2015 00:56:05 +0000 (00:56 +0000)]
Merge "Docs only change: update build version docs." into mnc-dev

8 years agoMerge "Send next alarm's show intent via PendingIntent" into mnc-dev
Adrian Roos [Thu, 15 Oct 2015 00:29:56 +0000 (00:29 +0000)]
Merge "Send next alarm's show intent via PendingIntent" into mnc-dev

8 years agoCamera: fix wrong FULL feature string
Yin-Chia Yeh [Tue, 6 Oct 2015 20:45:20 +0000 (13:45 -0700)]
Camera: fix wrong FULL feature string

Bug: 24678065
Change-Id: I2ca49565b919c87005d941863e22e3852a01a6c6

8 years agoMerge "Add anydpi to the providing-resources docs" into mnc-dev
Adam Lesinski [Mon, 5 Oct 2015 22:31:22 +0000 (22:31 +0000)]
Merge "Add anydpi to the providing-resources docs" into mnc-dev

8 years agoAdd anydpi to the providing-resources docs
Adam Lesinski [Tue, 8 Sep 2015 21:16:49 +0000 (14:16 -0700)]
Add anydpi to the providing-resources docs

Change-Id: Ic108d9da2e39b9f8581311fe610a1959a24a732f

8 years agoCamera2: Update video stabilization API doc.
Jianing Wei [Tue, 29 Sep 2015 21:24:36 +0000 (14:24 -0700)]
Camera2: Update video stabilization API doc.

Bug: 23353979
Change-Id: I781006d1b6ebbdf522ebbf6acc35b2062aff76b6

8 years agoMerge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into...
Billy Lau [Mon, 28 Sep 2015 17:18:30 +0000 (17:18 +0000)]
Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev

8 years agoDocs only change: update build version docs.
Dianne Hackborn [Thu, 17 Sep 2015 21:50:47 +0000 (14:50 -0700)]
Docs only change: update build version docs.

Change-Id: I30f55549394693ea04cd390b1ae66347ae212123

8 years agoam fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge...
Adrian Roos [Thu, 24 Sep 2015 23:32:01 +0000 (23:32 +0000)]
am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev

* commit 'fe7ceca1acdbcde6449f57bb19b45f8c948cc1f5':
  DO NOT MERGE Send next alarm's show intent via PendingIntent

8 years agoam 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next...
Adrian Roos [Thu, 24 Sep 2015 23:25:48 +0000 (23:25 +0000)]
am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev

* commit '9ceec2f0f007e05ed2842f222b4f652bdd69eb3f':
  DO NOT MERGE Send next alarm's show intent via PendingIntent

8 years agoam f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show...
Adrian Roos [Thu, 24 Sep 2015 23:11:55 +0000 (23:11 +0000)]
am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev

* commit 'f6c7515817f9a4c24d2ff9baba2f916795862098':
  DO NOT MERGE Send next alarm's show intent via PendingIntent

8 years agoam 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via...
Adrian Roos [Thu, 24 Sep 2015 22:59:37 +0000 (22:59 +0000)]
am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev

* commit '12c54dfa1219c5bb81482fe4bd4b164637f2e8b2':
  DO NOT MERGE Send next alarm's show intent via PendingIntent

8 years agoam c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent...
Adrian Roos [Thu, 24 Sep 2015 22:49:19 +0000 (22:49 +0000)]
am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev

* commit 'c9f7abe3705f7c74ad768e0a8e093f6f11e70e1c':
  DO NOT MERGE Send next alarm's show intent via PendingIntent

8 years agoMerge "DO NOT MERGE Send next alarm's show intent via PendingIntent" into lmp-dev
Adrian Roos [Thu, 24 Sep 2015 22:39:23 +0000 (22:39 +0000)]
Merge "DO NOT MERGE Send next alarm's show intent via PendingIntent" into lmp-dev

8 years agoam 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark...
Paul Jensen [Wed, 23 Sep 2015 14:42:02 +0000 (14:42 +0000)]
am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit '5ebe8e26f2c9517ce321a0fbcbed6efe2960da47':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge...
Paul Jensen [Wed, 23 Sep 2015 14:41:57 +0000 (14:41 +0000)]
am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '554cecea4c5e39c25efb721258366ce12e6b861c':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoam 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequest...
Paul Jensen [Wed, 23 Sep 2015 11:33:18 +0000 (11:33 +0000)]
am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit '4cbfe3316fd1105b697a9838ef7bafaebf5080a2':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network...
Paul Jensen [Wed, 23 Sep 2015 11:33:13 +0000 (11:33 +0000)]
am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '10a7d7449dae2aabf4f22f980e7efabf274a939a':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoam 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted...
Paul Jensen [Wed, 23 Sep 2015 11:21:27 +0000 (11:21 +0000)]
am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit '773d71e7c45d12810267bb24735360da6e5b258d':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability...
Paul Jensen [Wed, 23 Sep 2015 11:21:22 +0000 (11:21 +0000)]
am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '96cd7c14b5e4a82727f7b56bbdf6cfafda0f17b6':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoam 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they...
Paul Jensen [Wed, 23 Sep 2015 11:13:48 +0000 (11:13 +0000)]
am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit '962c3a0f2dd46d55ea591671c0a90c1c40214af7':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce...
Paul Jensen [Wed, 23 Sep 2015 11:13:40 +0000 (11:13 +0000)]
am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '635f871132449bea7489f6a61276979beeee5591':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoam ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have...
Paul Jensen [Wed, 23 Sep 2015 11:06:32 +0000 (11:06 +0000)]
am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit 'ece4ac2105d18d8d7b6296d6de3fdd5641c35258':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
Paul Jensen [Wed, 23 Sep 2015 11:06:27 +0000 (11:06 +0000)]
am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

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

8 years agoMerge "Don't mark NetworkRequests restricted when they don't have restricted caps...
Paul Jensen [Wed, 23 Sep 2015 10:59:31 +0000 (10:59 +0000)]
Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into lmp-dev

8 years agoMerge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
Paul Jensen [Wed, 23 Sep 2015 10:58:57 +0000 (10:58 +0000)]
Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

8 years agoam 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2...
Zach Jang [Mon, 21 Sep 2015 21:30:32 +0000 (21:30 +0000)]
am 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit '3e344f3fcb66f3e94a3b5436d5901dec0b94cbb3':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT...
Zach Jang [Mon, 21 Sep 2015 21:30:27 +0000 (21:30 +0000)]
am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit '0cae8381666248e44875756e72998e55ed3f9151':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09...
Zach Jang [Mon, 21 Sep 2015 21:07:04 +0000 (21:07 +0000)]
am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'ba80596bc0d51b3ddf14c1612c341992bc3ac5fc':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag...
Zach Jang [Mon, 21 Sep 2015 21:06:58 +0000 (21:06 +0000)]
am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'b5173241d160a5b6f4d440a01c9a9b0281ee4e66':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f35...
Zach Jang [Mon, 21 Sep 2015 19:10:51 +0000 (19:10 +0000)]
am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'f8cda08986a5caa14daace69e24c82224ac5a9fc':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp...
Zach Jang [Mon, 21 Sep 2015 19:10:46 +0000 (19:10 +0000)]
am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'e54c195a53694696e0913722fa721c882e33753e':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT...
Zach Jang [Mon, 21 Sep 2015 18:58:27 +0000 (18:58 +0000)]
am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'b2b3cecbd3de80d40f8c207c6aa94532c3426829':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security...
Zach Jang [Mon, 21 Sep 2015 18:58:18 +0000 (18:58 +0000)]
am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit '0a8197b1e43bc3771fc3f8595619603ec8f6f641':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoBug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
Billy Lau [Fri, 18 Sep 2015 09:19:54 +0000 (10:19 +0100)]
Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE

Previously, when CHANGE_NETWORK_STATE's protection level was raised to
signature from normal, the documentation was not changed. This CL
addresses the documentation to reflect the correct protection level.

Change-Id: I0a4d2fcef5f30c58b38250865543e72b5eb1ab06

8 years agoRelax locking when scanning private volumes.
Jeff Sharkey [Fri, 18 Sep 2015 01:15:10 +0000 (18:15 -0700)]
Relax locking when scanning private volumes.

Private volumes with many large apps can take a long time to scan,
which currently happens on the main thread with several large locks
held, making it likely to trigger the system-wide watchdog.

This change relaxes this locking by scanning on the PackageManager
worker thread, and by only holding locks when required.  In
particular, we release the installer lock between each scan to give
other apps waiting to dexopt a chance to breathe.

Bug: 24172036
Change-Id: Ie28d3ff72d6be28fa2f72c57d5e4146c768df89d

8 years agoam 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev
Zach Riggle [Thu, 17 Sep 2015 22:25:53 +0000 (22:25 +0000)]
am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev

* commit '9836b64f529238d1219f1937abf481383cd0cacd':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

8 years agoam f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev
Zach Riggle [Thu, 17 Sep 2015 22:17:11 +0000 (22:17 +0000)]
am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev

* commit 'f68b1953259a13562f5a2331526edafae5c1d99f':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

8 years agoam 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev
Zach Riggle [Thu, 17 Sep 2015 22:00:29 +0000 (22:00 +0000)]
am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev

* commit '683cd049f7c762251567a0e0386ee49bb1428351':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

8 years agoresolved conflicts for 521def98 to lmp-mr1-dev
Zach Riggle [Thu, 17 Sep 2015 21:34:08 +0000 (17:34 -0400)]
resolved conflicts for 521def98 to lmp-mr1-dev

8 years agoam 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport...
Zach Jang [Thu, 17 Sep 2015 20:44:41 +0000 (20:44 +0000)]
am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit '7b5bf993e4cc9f333a9adb3a00672c668a0f3fdb':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165...
Zach Jang [Thu, 17 Sep 2015 20:32:53 +0000 (20:32 +0000)]
am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'fe4cbf2b1b135b327018915a512a8e6293a96017':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security...
Zach Jang [Thu, 17 Sep 2015 20:24:00 +0000 (20:24 +0000)]
am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'cff4e09e26e3b976aa0273df78e89f592fc6d287':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level...
Zach Jang [Thu, 17 Sep 2015 20:09:55 +0000 (20:09 +0000)]
am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'bdf7f3583c637f370e97e74526df14b9c70e6493':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level...
Zach Jang [Thu, 17 Sep 2015 20:04:23 +0000 (20:04 +0000)]
am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit '1cf21e443aaf207b962f50169be28c0babe71f61':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoDO NOT MERGE - Backport of ag/748165 to klp-dev
Zach Jang [Fri, 11 Sep 2015 23:35:04 +0000 (16:35 -0700)]
DO NOT MERGE - Backport of ag/748165 to klp-dev
Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d

8 years agoDO NOT MERGE - Backport of ag/748165 to klp-dev
Zach Jang [Fri, 11 Sep 2015 23:35:04 +0000 (16:35 -0700)]
DO NOT MERGE - Backport of ag/748165 to klp-dev
Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d

8 years agoam 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE...
Zach Jang [Wed, 16 Sep 2015 02:06:31 +0000 (02:06 +0000)]
am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev

* commit '63348ae4572cd9394e79fe343d2fca2b38498d1c':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""

8 years agoam 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump...
Zach Jang [Wed, 16 Sep 2015 02:06:26 +0000 (02:06 +0000)]
am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev

* commit '1b06455e44395489dcd027a170e68eabf2ebe1da':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."

8 years agoam 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout...
Zach Jang [Wed, 16 Sep 2015 01:56:57 +0000 (01:56 +0000)]
am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev

* commit '11317e82cf561597bbd4e2dbf5840854e6b7a16d':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""

8 years agoam 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncry...
Zach Jang [Wed, 16 Sep 2015 01:56:52 +0000 (01:56 +0000)]
am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev

* commit '00db0826561b23a54db28ed5203fd7eff79c16c7':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."

8 years agoam 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt...
Zach Jang [Wed, 16 Sep 2015 01:44:58 +0000 (01:44 +0000)]
am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev

* commit '32a420ea36fbae07484f6fcf718ed97865ca3158':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""

8 years agoam 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s...
Zach Jang [Wed, 16 Sep 2015 01:44:53 +0000 (01:44 +0000)]
am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev

* commit '203b43547da94c9fb78931680b99f9db49fc46c9':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."

8 years agoMerge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""...
Zach Jang [Wed, 16 Sep 2015 01:40:18 +0000 (01:40 +0000)]
Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev

8 years agoRevert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 01:38:41 +0000 (01:38 +0000)]
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""

This reverts commit 3b49affdb3e18bbe48fc7ab00ccbe2c073b7e35e.

Change-Id: I8639fc6865081f6b1a5773b884f8298cce0d3e7d

8 years agoMerge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp...
Zach Jang [Wed, 16 Sep 2015 01:37:36 +0000 (01:37 +0000)]
Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev

8 years agoDO NOT MERGE Send next alarm's show intent via PendingIntent
Adrian Roos [Sat, 12 Sep 2015 00:46:23 +0000 (17:46 -0700)]
DO NOT MERGE Send next alarm's show intent via PendingIntent

Bug: 23909438
Change-Id: I0bb277c8385b7936fbda03cd76f02248c4fc55de

8 years agoRevert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Tue, 15 Sep 2015 20:09:52 +0000 (20:09 +0000)]
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."

This reverts commit 82b70db7dd906013d131737a5bec2ae59b41ae61.

Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f

8 years agoSend next alarm's show intent via PendingIntent
Adrian Roos [Sat, 12 Sep 2015 00:46:23 +0000 (17:46 -0700)]
Send next alarm's show intent via PendingIntent

Also send all IntentTile intents via PendingIntent.

Bug: 23909438
Change-Id: I0bb277c8385b7936fbda03cd76f02248c4fc55de

8 years agoDefault grant SMS and Phone to the verifier
Svet Ganov [Sat, 12 Sep 2015 17:19:54 +0000 (10:19 -0700)]
Default grant SMS and Phone to the verifier

bug:24012164

Change-Id: I756644c8044076b2550d7ca104f542f50da0226b

8 years agoam 4c330c6a: DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Michael Wright [Sat, 12 Sep 2015 06:29:09 +0000 (06:29 +0000)]
am 4c330c6a: DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

* commit '4c330c6ae53df48f6486b6f047021b204fc66594':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

8 years agoAdd op package to the UID special case handling in account manager.
Svetoslav [Thu, 10 Sep 2015 22:30:45 +0000 (15:30 -0700)]
Add op package to the UID special case handling in account manager.

The account manager has a hardcoded rule to change the calling
UID if the caller is the system and another UID is passed in.
We have to do the same acrobatics for the app op package as if
the UID changes the opPackageName will not match the new UID.
If we used the passed in UID we should also use the passed in
op package name.

bug:23968092

Change-Id: I0c0c2a720e9edbf82001952929d990702f8650ca

8 years agoMerge "Add get_accounts app op" into mnc-dev
Svetoslav Ganov [Wed, 9 Sep 2015 01:36:58 +0000 (01:36 +0000)]
Merge "Add get_accounts app op" into mnc-dev

8 years agoAdd get_accounts app op
Svetoslav [Tue, 8 Sep 2015 21:36:35 +0000 (14:36 -0700)]
Add get_accounts app op

For each runtime permission we have an app op to toggle the
permission for legacy apps as they cannot handle permission
revocations. We were lacking an app op for get_accounts
which prevented the user from controlling access to accounts
regardelss that they change the state of the permission
toggle in the UI. Even worse the permission UI is written
with the assumption that every runtime permission has an
app op and as a result revoking the contacts group (if the
app requests the get_accounts permission) is reset back to
allowed in the UI.

bug:23854618

Change-Id: I9e3f9bfeb320bed561d718db99ee285915d5701b

8 years agoam 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesour...
Android Git Automerger [Tue, 8 Sep 2015 21:46:08 +0000 (21:46 +0000)]
am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev

* commit '1c88f605629a5f1647a8af1fdcfe0fb6e3eea847':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

8 years agoam 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove...
Cheryl Potter [Tue, 8 Sep 2015 21:46:02 +0000 (21:46 +0000)]
am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

* commit '9e28efe4e79402e1ae9c92579d4ea2bc5b4bb664':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

8 years agoMerge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct...
Android Git Automerger [Tue, 8 Sep 2015 21:37:33 +0000 (21:37 +0000)]
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev

8 years agodocs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 11 Aug 2015 18:43:59 +0000 (11:43 -0700)]
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

b/22822607

Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20

8 years agoam 4b32b3f4: Merge "docs: change intro and title for contacts and sign-in lesson...
Cheryl Potter [Tue, 8 Sep 2015 21:36:35 +0000 (21:36 +0000)]
am 4b32b3f4: Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs

* commit '4b32b3f43fe8e27ffdb19d51364ebd99a3503e79':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

8 years agoMerge "docs: change intro and title for contacts and sign-in lesson, and remove empty...
Cheryl Potter [Tue, 8 Sep 2015 21:28:06 +0000 (21:28 +0000)]
Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs

8 years agodocs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Cheryl Potter [Tue, 11 Aug 2015 18:43:59 +0000 (11:43 -0700)]
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

b/22822607

Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20

8 years agoam 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Googl...
Cheryl Potter [Fri, 4 Sep 2015 22:35:43 +0000 (22:35 +0000)]
am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs

* commit '4afcda743d0ba14ee0d3449e7f15518f3cc538dc':
  docs: changed references to Google+ sign-in to Google sign-in

8 years agoam a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.
Renato Mangini [Fri, 4 Sep 2015 22:35:36 +0000 (22:35 +0000)]
am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.

* commit 'a8b9a2b7aeab97f71ff876319d807d9f151c6065':
  Minor fix on Auto Desktop Head Unit doc.

8 years agoam 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in...
Cheryl Potter [Fri, 4 Sep 2015 22:24:55 +0000 (22:24 +0000)]
am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs

* commit '79ad6310ea3ca5931013cf746babf55cf391cc8f':
  docs: changed references to Google+ sign-in to Google sign-in

8 years agoam 81e0dff0: Minor fix on Auto Desktop Head Unit doc.
Renato Mangini [Fri, 4 Sep 2015 22:24:48 +0000 (22:24 +0000)]
am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.

* commit '81e0dff0da637f3580ac81e86950b23e9a55bbdc':
  Minor fix on Auto Desktop Head Unit doc.

8 years agoMerge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-previe...
Cheryl Potter [Fri, 4 Sep 2015 22:14:25 +0000 (22:14 +0000)]
Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs

8 years agoMerge "Don't crash on (invalid) hardware address lengths > 127." into mnc-dev
Ian Pedowitz [Thu, 3 Sep 2015 17:22:21 +0000 (17:22 +0000)]
Merge "Don't crash on (invalid) hardware address lengths > 127." into mnc-dev

8 years agoMerge "Don't drop runtime permissions on older system app update." into mnc-dev
Svetoslav Ganov [Thu, 3 Sep 2015 17:08:57 +0000 (17:08 +0000)]
Merge "Don't drop runtime permissions on older system app update." into mnc-dev

8 years agoMerge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
Wale Ogunwale [Thu, 3 Sep 2015 17:06:03 +0000 (17:06 +0000)]
Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev

8 years agoDon't crash on (invalid) hardware address lengths > 127.
Lorenzo Colitti [Thu, 3 Sep 2015 08:36:20 +0000 (17:36 +0900)]
Don't crash on (invalid) hardware address lengths > 127.

These would cause us to crash with a NegativeArraySizeException
when trying to create the clientMac array. Instead, if the length
is > 16 (invalid, because the field is only 16 bytes long), fudge
it to 6 (Ethernet / wifi).  This is a bit less liberal than the
legacy client, which doesn't check the length at all.

Bug: 23725795
Change-Id: I83f47bfc400ffa8ce85dd9d1b8eb96be5afe51a5

8 years agoRespect DONT_KILL_APP flag when bringing down a disabled service.
Wale Ogunwale [Wed, 2 Sep 2015 21:53:29 +0000 (14:53 -0700)]
Respect DONT_KILL_APP flag when bringing down a disabled service.

Commit 540e123 introduce logic to clean up states when a component is
disabled. For services this included marking the process running the
service as removed so it can be killed later. However, this wasn't
respecting the Intent.EXTRA_DONT_KILL_APP flag where the caller
doesn't want the process of the disabled component to be killed.
This change now takes the flag into account.

Bug: 23491822
Bug: 15804187
Change-Id: I54a6e03cd66164dc8c4606a3c462114fe661ea8e

8 years agoDon't drop runtime permissions on older system app update.
Svetoslav [Wed, 2 Sep 2015 20:53:05 +0000 (13:53 -0700)]
Don't drop runtime permissions on older system app update.

We have a device with an installed version of an app that is not
preinstalled and has some runtime permissions granted. Now we get
OTA with an older version of the app which does not request these
runtime permissions. We first scan system packages and then installed
apps. During the scan we encounter the newly appeared system package
and determine it is older than the one we have installed and disable
it.

However, before we disable the package we update the permissions
for this package but since the one on the system partition (the one
we found so far) doesn't request some of the runtime permissions
granted to the installed version of the app, they get dropped on the
floor. This grant attempt is not necessary as the permission the
installed package has depends entirely on the permissions it requests.
In this process we may look at the requested permissions on the
disabled system package but in general the updated package cannot
have a permission that it does not request regardless whether the
disabled system app requests it or on.

bug:23718806

Change-Id: I187bc11750eb270c3233c314992186f5d58d9d82

8 years agoApply default link-handling policy at OTA from pre-M
Christopher Tate [Wed, 2 Sep 2015 19:54:41 +0000 (12:54 -0700)]
Apply default link-handling policy at OTA from pre-M

Not just at first (wiped) boot.

Bug 23744303

Change-Id: I9ab42f7b081e92231d89b3c97935135c3dd901d4

8 years agoMerge "Allow shell to disable keyguard when not secure" into mnc-dev
Tim Kilbourn [Wed, 2 Sep 2015 17:28:08 +0000 (17:28 +0000)]
Merge "Allow shell to disable keyguard when not secure" into mnc-dev

8 years agoMerge "Fix Custom action mode menu item onclick is not working" into mnc-dev
Clara Bayarri [Wed, 2 Sep 2015 09:31:06 +0000 (09:31 +0000)]
Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev

8 years agoMerge "Fixed a crash in the notification group manager" into mnc-dev
Selim Cinek [Wed, 2 Sep 2015 00:25:05 +0000 (00:25 +0000)]
Merge "Fixed a crash in the notification group manager" into mnc-dev

8 years agoam eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching.
Deepanshu Gupta [Wed, 2 Sep 2015 00:11:24 +0000 (00:11 +0000)]
am eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching.

* commit 'eb54172719db60740a0b8dde6380db54d4006159':
  LayoutLib: Fix typedArray caching.

8 years agoFixed a crash in the notification group manager
Selim Cinek [Wed, 2 Sep 2015 00:07:38 +0000 (17:07 -0700)]
Fixed a crash in the notification group manager

When 2 notifications were posted as the summary of the same
group, then the system would eventually crash.

Bug: 23676310
Change-Id: Ia8f95e624f3f43d1b55169dd8102e3c89427dc76

8 years agoam dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching.
Deepanshu Gupta [Tue, 1 Sep 2015 23:59:10 +0000 (23:59 +0000)]
am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching.

* commit 'dd21212fa1a9c907d5d2f80f3de2413f6c14da7a':
  LayoutLib: Fix typedArray caching.