OSDN Git Service

android-x86/frameworks-base.git
8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:16:24 +0000 (02:16 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4
am: bf29f10c1e

* commit 'bf29f10c1e7dd37c3020bc7a792bb7bda451a149':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3...
Shreyas Basarge [Fri, 13 Nov 2015 02:09:36 +0000 (02:09 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af
am: 44368e6dd4

* commit '44368e6dd4ec56e9eca47b1e81d307f672bb3006':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812
Shreyas Basarge [Fri, 13 Nov 2015 02:03:01 +0000 (02:03 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812
am: f5f03a19af

* commit 'f5f03a19affc6775ac3e44a3540351e132fffc0e':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8
Shreyas Basarge [Fri, 13 Nov 2015 01:56:34 +0000 (01:56 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8
am: cc7c1d3812

* commit 'cc7c1d381249edfd906cb57afbd8589e6c345141':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2
Matthew Williams [Fri, 13 Nov 2015 01:56:30 +0000 (01:56 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2
am: a0d20db02f

* commit 'a0d20db02f0e6cfc06ec37cfc68ce626dd35858a':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: c0f39c1ece
Matthew Williams [Fri, 13 Nov 2015 01:50:11 +0000 (01:50 +0000)]
Sync extras bundle comparison can throw NPE am: c0f39c1ece
am: 34b700a7c2

* commit '34b700a7c2355f1dbea4b8d796619033bdd87a0c':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE am: 2f137b7705
Shreyas Basarge [Fri, 13 Nov 2015 01:50:02 +0000 (01:50 +0000)]
Sync extras bundle comparison can throw NPE am: 2f137b7705
am: 294611faa8

* commit '294611faa8bd1bdbf75adc3cee835b69d348df86':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 01:41:59 +0000 (01:41 +0000)]
Sync extras bundle comparison can throw NPE
am: c0f39c1ece

* commit 'c0f39c1ece72a05c796f7ba30b7a2b5b580d5025':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 01:41:59 +0000 (01:41 +0000)]
Sync extras bundle comparison can throw NPE
am: 2f137b7705

* commit '2f137b7705875ee026319abb8e512d918c118222':
  Sync extras bundle comparison can throw NPE

8 years agoSync extras bundle comparison can throw NPE
Shreyas Basarge [Thu, 12 Nov 2015 15:32:44 +0000 (15:32 +0000)]
Sync extras bundle comparison can throw NPE

Bug: 23591205
Change-Id: I960dfcc1584c0a17685790d5d722eaf11b930e25

8 years agoSync extras bundle comparison can throw NPE
Matthew Williams [Fri, 16 Oct 2015 19:01:31 +0000 (12:01 -0700)]
Sync extras bundle comparison can throw NPE

BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c8403354a985258c098681067e74b9e2f638)

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: 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 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 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 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 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 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 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 agoam eb26f5ce: LayoutLib: Fix typedArray caching.
Deepanshu Gupta [Tue, 1 Sep 2015 23:40:40 +0000 (23:40 +0000)]
am eb26f5ce: LayoutLib: Fix typedArray caching.

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

8 years agoLayoutLib: Fix typedArray caching.
Deepanshu Gupta [Wed, 26 Aug 2015 18:54:50 +0000 (11:54 -0700)]
LayoutLib: Fix typedArray caching.

The typedArray depends on the current context (more specifically, the
themes set on the context). The fact was ignored in the caching of the
typedArray and caused the android:theme attribute to be ignored in
certain cases.

Change-Id: If095580919474f12c0eb4e1f8fb7f076cf3c4ed0

8 years agoam 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for...
Bart Sears [Mon, 31 Aug 2015 22:03:48 +0000 (22:03 +0000)]
am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev

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

8 years agoam 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Tao Bao [Mon, 31 Aug 2015 22:03:44 +0000 (22:03 +0000)]
am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.

* commit '82b70db7dd906013d131737a5bec2ae59b41ae61':
  [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.

8 years agoMerge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into...
Bart Sears [Mon, 31 Aug 2015 21:53:46 +0000 (21:53 +0000)]
Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev

8 years ago[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Tao Bao [Sat, 29 Aug 2015 00:46:20 +0000 (17:46 -0700)]
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.

Bug: 23629892
Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d

8 years agoDO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Michael Wright [Mon, 24 Aug 2015 23:00:05 +0000 (00:00 +0100)]
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

If the given app name is too long for the permissions dialog, then
it can push the warning that the application will be able to record
the screen below the fold, letting the app basically set its own
dialog message in a way that a user would be difficult to detect as
fraudulant.

Bug: 23345192
Change-Id: If5881ca75d5c155ef5174351d245dbc3abdaa584

8 years agoDO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Michael Wright [Mon, 24 Aug 2015 23:00:05 +0000 (00:00 +0100)]
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

If the given app name is too long for the permissions dialog, then
it can push the warning that the application will be able to record
the screen below the fold, letting the app basically set its own
dialog message in a way that a user would be difficult to detect as
fraudulant.

Bug: 23345192
Change-Id: If5881ca75d5c155ef5174351d245dbc3abdaa584

8 years agoDon't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Fri, 28 Aug 2015 16:00:15 +0000 (12:00 -0400)]
Don't mark NetworkRequests restricted when they don't have restricted caps

Requests without NET_CAPABILITIES_INTERNET and just the default network
capabilities should not be marked restricted.  Without this fix apps
can hit permissions exceptions if they inadvertently make requests
without NET_CAPABILITIES_INTERNET.

Bug:23164917
Change-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6
(cherry picked from commit aae613d96134245af7c55976731a49fa59e77470)

8 years agoFix NOT_RESTRICTED network capability and enforce it.
Paul Jensen [Fri, 28 Aug 2015 15:58:50 +0000 (11:58 -0400)]
Fix NOT_RESTRICTED network capability and enforce it.

With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
   special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
   permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
   CONNECTIVITY_INTERNAL permission

Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
(cherry picked from commit 487ffe7d3d84bf65212158f7098e8a84b5b55e09)

8 years agoam a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:58:35 +0000 (05:58 +0000)]
am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]

* commit 'a1be8b43e49d7b3555af6f284e4bb416ae6d477f':
  LayoutLib: Update golden test images. [DO NOT MERGE]

8 years agoam c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:58:30 +0000 (05:58 +0000)]
am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE]

* commit 'c9862b4429b32985d5267fa6ae28025278bdd603':
  An ugly hack to render CalendarView. [DO NOT MERGE]

8 years agoam b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:58:25 +0000 (05:58 +0000)]
am b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

* commit 'b1ad4a155957160de9c4ad5c5beb39ce00ef6799':
  LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

8 years agoam da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:58:21 +0000 (05:58 +0000)]
am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

* commit 'da687918e13010d56e3d067e0ef477165cf38e10':
  Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

8 years agoam 8c674fda: Fix layout mirroring. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:58:16 +0000 (05:58 +0000)]
am 8c674fda: Fix layout mirroring. [DO NOT MERGE]

* commit '8c674fda8939c2d30f85e0341b70d9f3edd04d6c':
  Fix layout mirroring. [DO NOT MERGE]

8 years agoam 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:58:06 +0000 (05:58 +0000)]
am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

* commit '7aa36129403de74c485f286d290787e38565ddae':
  Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

8 years agoam 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:58 +0000 (05:57 +0000)]
am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

* commit '92f373fe3209f9372d6168b016ae613f7df0625b':
  Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

8 years agoam 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:53 +0000 (05:57 +0000)]
am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

* commit '66d914018cf605c25fb6b2f53627ef702decbdd1':
  Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

8 years agoam 6b1b651f: Fix imports. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:48 +0000 (05:57 +0000)]
am 6b1b651f: Fix imports. [DO NOT MERGE]

* commit '6b1b651fedc421265d328f1b74512e62ac8a2e13':
  Fix imports. [DO NOT MERGE]

8 years agoam 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:40 +0000 (05:57 +0000)]
am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE]

* commit '5ad4dae1578dd6823da93ee8382f07ec2814e3ba':
  Fix theme namespace in tests. [DO NOT MERGE]

8 years agoam 723e136f: Run setup for full tests only once. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:31 +0000 (05:57 +0000)]
am 723e136f: Run setup for full tests only once. [DO NOT MERGE]

* commit '723e136f96a06360a62dc981da1c8ea0ae546660':
  Run setup for full tests only once. [DO NOT MERGE]

8 years agoam 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:25 +0000 (05:57 +0000)]
am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

* commit '3ba16c1d9d53d520543e1bd363236453101096ec':
  LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

8 years agoam 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:17 +0000 (05:57 +0000)]
am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

* commit '55a363376b4d877870650a5a4b757d286f571345':
  LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

8 years agoam d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:13 +0000 (05:57 +0000)]
am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

* commit 'd861fd81f7a2e62a31c4f2c7aed66fceb475d0c8':
  Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

8 years agoam 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:08 +0000 (05:57 +0000)]
am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]

* commit '82fae621533f9d8fc92f5a8d330ebe94a67ff07d':
  LayoutLib: translucent sys ui bars [DO NOT MERGE]

8 years agoam 9068539a: Update nav bar icons. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:04 +0000 (05:57 +0000)]
am 9068539a: Update nav bar icons. [DO NOT MERGE]

* commit '9068539a48e13a7d32342e46db32b6f5fa3d531e':
  Update nav bar icons. [DO NOT MERGE]

8 years agoam e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:59 +0000 (05:56 +0000)]
am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

* commit 'e5afc3117be394fdd92496b39e9bad248972902a':
  Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

8 years agoam c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:55 +0000 (05:56 +0000)]
am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

* commit 'c989950dbf18dc294aebfff47c86bfd0349377a0':
  CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

8 years agoam b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:50 +0000 (05:56 +0000)]
am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

* commit 'b2fdaca9590f808fda08e055edbf6fca8030d7d3':
  Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

8 years agoam a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:45 +0000 (05:56 +0000)]
am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]

* commit 'a14ec6f450eaff09b6800fc40616a00cf4899df8':
  Change tools:list_item to listitem. [DO NOT MERGE]

8 years agoam b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:41 +0000 (05:56 +0000)]
am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE]

* commit 'b1e21330f82ec0940658b16dfe7e14e8da8c5d33':
  Implement tools:list_item for RecyclerView. [DO NOT MERGE]

8 years agoam cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]
Jens Ole Lauridsen [Wed, 26 Aug 2015 05:56:36 +0000 (05:56 +0000)]
am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]

* commit 'cd4d5b3f38186f845e00454b4b95bec77c3ac8fd':
  Support AppBar from Material Design. [DO NOT MERGE]

8 years agoam de13095d: Update tests per new layoutlib_api [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:31 +0000 (05:56 +0000)]
am de13095d: Update tests per new layoutlib_api [DO NOT MERGE]

* commit 'de13095d5d6b404c41d36d18d060fb41a9a4fc31':
  Update tests per new layoutlib_api [DO NOT MERGE]

8 years agoam db67caa6: Add missing resolveResValue call. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:27 +0000 (05:56 +0000)]
am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]

* commit 'db67caa60c6050e7a46d1b90ccb6847a5b8ec661':
  Add missing resolveResValue call. [DO NOT MERGE]

8 years agoam 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:22 +0000 (05:56 +0000)]
am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]

* commit '6eef124657a6e7d2c70b284f22d6c0006cfea93a':
  LayoutLib: Skip classes from java package. [DO NOT MERGE]

8 years agoam 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:08 +0000 (05:56 +0000)]
am 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]

* commit '4f5e6c631522649796413c63695ae45b8759eba8':
  Skip warnings for some unresolved references. [DO NOT MERGE]

8 years agoam 3e875dbb: Fix import order. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:00 +0000 (05:56 +0000)]
am 3e875dbb: Fix import order. [DO NOT MERGE]

* commit '3e875dbb38c812e3684193fdefa04433c84541db':
  Fix import order. [DO NOT MERGE]

8 years agoam e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:47 +0000 (05:55 +0000)]
am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]

* commit 'e5fa12ad781c1759e0ff94dbc649be0e14844306':
  Fix ParserFactory not initialized error. [DO NOT MERGE]

8 years agoam a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:42 +0000 (05:55 +0000)]
am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

* commit 'a287b8428ac6d9073f84f9b2f47ba5fc73939f10':
  Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

8 years agoam e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:37 +0000 (05:55 +0000)]
am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]

* commit 'e698bb27f3a0090e01132fd7b5a6d95abcbbfc18':
  Fix BridgeTypedArray.getType() [DO NOT MERGE]

8 years agoam e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:33 +0000 (05:55 +0000)]
am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]

* commit 'e481e713f24c83a3347fd83580d07252d589ec3b':
  Include Shapes in LayoutLib. [DO NOT MERGE]

8 years agoam ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:26 +0000 (05:55 +0000)]
am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]

* commit 'ba5a02c5aa3c9850cdd72e592e9fa8a8d92db7ef':
  LayoutLib: Support getting resource arrays. [DO NOT MERGE]

8 years agoam a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:19 +0000 (05:55 +0000)]
am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]

* commit 'a5ffed0b69ac41d65aacc6ee586688a22226f64b':
  LayoutLib: Change nullity annotations. [DO NOT MERGE]

8 years agoam c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:14 +0000 (05:55 +0000)]
am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

* commit 'c96ef95285e935034377dee30f3b8a0329f6c3a2':
  Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

8 years agoam b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:07 +0000 (05:55 +0000)]
am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

* commit 'b318ff54fcd17e7aadd1b0251c34cba348898704':
  Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

8 years agoam cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:02 +0000 (05:55 +0000)]
am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]

* commit 'cc5e69e4fed8bb797dc3f83c1de32eaf4a52f324':
  Inject anonymous inner classes of injected classes [DO NOT MERGE]

8 years agoam d7e89906: Update platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:58 +0000 (05:54 +0000)]
am d7e89906: Update platformDir search in tests. [DO NOT MERGE]

* commit 'd7e89906a453a562a8fef303fc6c4068dfa5c0d0':
  Update platformDir search in tests. [DO NOT MERGE]

8 years agoam afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:52 +0000 (05:54 +0000)]
am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]

* commit 'afedbc47b3c8f3fa9955496e6ceb7f5702dd90a3':
  Make Context.getClassLoader() work. [DO NOT MERGE]

8 years agoam 92480a9a: Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:44 +0000 (05:54 +0000)]
am 92480a9a: Fix include tag rendering. [DO NOT MERGE]

* commit '92480a9ad89a813bdf36185fa8c4d227d8415b4c':
  Fix include tag rendering. [DO NOT MERGE]

8 years agoam f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:39 +0000 (05:54 +0000)]
am f6b08547: Show better error message for color attr not found. [DO NOT MERGE]

* commit 'f6b08547458b9219da1717a79363f778bfc57dd0':
  Show better error message for color attr not found. [DO NOT MERGE]