OSDN Git Service
Winson Chung [Fri, 13 Nov 2015 18:15:30 +0000 (18:15 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3
am:
b133b984a0
* commit '
b133b984a0644a78270d51007123e75ded24eb14':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:08:38 +0000 (18:08 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev
am:
bb4da4efc3
* commit '
bb4da4efc320caee77f11bb316145b8e5f264e07':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:02:38 +0000 (18:02 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev
Shreyas Basarge [Fri, 13 Nov 2015 02:23:40 +0000 (02:23 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4 am:
bf29f10c1e
am:
359ee7f47d
* commit '
359ee7f47de2eee82951abed294e4db44405973c':
Sync extras bundle comparison can throw NPE
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
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
Matthew Williams [Fri, 13 Nov 2015 02:03:01 +0000 (02:03 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece am:
34b700a7c2 am:
a0d20db02f
am:
6d13650c74
* commit '
6d13650c74b7cab047e43a4a3a0b880a832dd2db':
Sync extras bundle comparison can throw NPE
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
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
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
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
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
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
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
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
Winson [Wed, 11 Nov 2015 00:19:38 +0000 (16:19 -0800)]
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Bug:
25476219
Change-Id: I5bb9cca74790521de71c0037b4f2421c3d21b3f6
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)
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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.
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
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.
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
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.
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
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.
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
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
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
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
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
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
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
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
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.
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.
Zach Riggle [Thu, 17 Sep 2015 21:34:08 +0000 (17:34 -0400)]
resolved conflicts for
521def98 to lmp-mr1-dev
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
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
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
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
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
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
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
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.""
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."
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.""
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."
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
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
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
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
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
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.
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
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
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
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
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
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
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.
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
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.
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.
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
Bart Sears [Mon, 31 Aug 2015 22:20:06 +0000 (22:20 +0000)]
am
3cb7e91f: am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
3cb7e91f2cd1fb29e6d0926e35f90647200c1af4':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 22:19:58 +0000 (22:19 +0000)]
am
35c1eb9e: am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
35c1eb9e6506b407a1af40359d48bb06d884385d':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
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.
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.
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
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
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
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
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)
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)
Renato Mangini [Thu, 27 Aug 2015 18:11:55 +0000 (11:11 -0700)]
Minor fix on Auto Desktop Head Unit doc.
Change-Id: I245484e87fadcc98fabc6f4c4fc67f2b454f9874
Rich Slogar [Thu, 27 Aug 2015 01:19:52 +0000 (01:19 +0000)]
am
0238bf24: docs: New auto Desktop Head Unit (DHU) docs
* commit '
0238bf248095682b870732432095a987ee558aa2':
docs: New auto Desktop Head Unit (DHU) docs
Rich Slogar [Thu, 23 Jul 2015 23:05:27 +0000 (16:05 -0700)]
docs: New auto Desktop Head Unit (DHU) docs
See comment on patch set 9 for doc stage location.
bug:
22069078
bug:
23341937
Change-Id: I21565b82199394622ce4113b42174277c0248998
Deepanshu Gupta [Wed, 26 Aug 2015 20:22:48 +0000 (20:22 +0000)]
am
42994097: am
a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]
* commit '
4299409775ffd5cb70a8970c15807f33fc8b08d4':
LayoutLib: Update golden test images. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:22:43 +0000 (20:22 +0000)]
am
2b99b5da: am
c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE]
* commit '
2b99b5da279a7cbf1f6412a8ac7d6bfdd82e26c6':
An ugly hack to render CalendarView. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:22:35 +0000 (20:22 +0000)]
am
7eb81868: am
b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]
* commit '
7eb81868c338fc78139592ac81845c080f53b1c5':
LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:22:29 +0000 (20:22 +0000)]
am
9d6e87b6: am
da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]
* commit '
9d6e87b67eb0d39d7584b12a3e843db68c8c9f3b':
Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:22:23 +0000 (20:22 +0000)]
am
c43506fc: am
8c674fda: Fix layout mirroring. [DO NOT MERGE]
* commit '
c43506fc2dbe3fea6885e74ac8c67b91a0a644ff':
Fix layout mirroring. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:22:17 +0000 (20:22 +0000)]
am
918e62f1: am
7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]
* commit '
918e62f1cb7e5802cfb7435dd606380fa5d3a278':
Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:22:11 +0000 (20:22 +0000)]
am
eb15670c: am
92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]
* commit '
eb15670ccc46c688537cd99fa1af2e475a5fd2be':
Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:22:05 +0000 (20:22 +0000)]
am
42e53ecb: am
66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]
* commit '
42e53ecbc146c4b131961e1f1764fcf886204b07':
Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:21:55 +0000 (20:21 +0000)]
am
5078ad32: am
6b1b651f: Fix imports. [DO NOT MERGE]
* commit '
5078ad325b0da36fe798df1df428d12732548217':
Fix imports. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:21:49 +0000 (20:21 +0000)]
am
4a213763: am
5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE]
* commit '
4a2137639aba761dcf289f1e2cc2e48dd42e7a3f':
Fix theme namespace in tests. [DO NOT MERGE]
OSDN Git Service
