OSDN Git Service
Todd Kennedy [Wed, 25 Oct 2017 17:11:09 +0000 (10:11 -0700)]
Allow internal services access to instant apps
Any system UID [those with a UID < Process.FIRST_APPLICATION_UID] should be
able to see instant applications. These are trusted processes and will often
need to verify permissions of the calling instant app.
Change-Id: I4ec899ffd45d931a17d4ea0bfacf3004d3e074ef
Fixes:
67849834
Test: Manual.
Test: Install hellozip_base.apk from bug:
Test: $ adb install --instantapp -i com.android.vending hellozip_base.apk
Test: Run hellozip
Test: $ adb shell am start -a android.intent.action.VIEW -c android.intent.category.BROWSABLE -d https://hello.samples.androidinstantapps.com/hello
Test: Try to capture a photo and see that the app crashes with a SecurityException before the patch and that a photo is taken after the patch
Test: Try to record audio and see that the app crashes with an IllegalStateException before the patch and that the app doesn't crash after the patch
(cherry picked from commit
17e40d2fb6d5ad2be3b71d3bc1232ea84f6596b6)
Donald Chai [Fri, 13 Oct 2017 04:00:45 +0000 (21:00 -0700)]
AAPT: treat "-I" with lower precedence than main APK for dumping.
This is the desired behavior if resource IDs may overlap, and also happens to
improve the behavior of:
aapt dump -I base.apk badging feature.apk
when both APKs use the same package name with different package IDs
(base=0x7F, feature=0x80). Previously, the final call to
DynamicRefTable::addMapping was for base.apk, and all references to 0x80 were
rewritten in DynamicRefTable::lookupResourceId to 0x7F. After this
change resources defined in both APKs are resolved correctly.
Note that this is a bit of kludge, and APKs should use different names
to avoid conflating the package IDs.
Fixes:
67070085
Bug:
64058531
Test: manual with sample in b/
67070085#comment2
Change-Id: I285adb6f44a297440b08fc7a1f9ad73c700eb9bc
(cherry picked from commit
d1ac6e1f9ea3a4d6c0d6d4a118c61526b8234a5f)
(cherry picked from commit
94251fac62b12f030c404132a395fdef73e7ab29)
ztenghui [Fri, 13 Oct 2017 22:56:08 +0000 (15:56 -0700)]
AAPT leave <gradient> alone for VDC
bug:
62421666
Test: Tested with changes for Gradient of VDC.
Change-Id: I07b39721aeaaafd888416a0f71f6cbd5fce97732
(cherry picked from commit
ab2a38c03d54fad1ed0873ac091959ee38823cd6)
(cherry picked from commit
f49cce3aa6f625cfc7288886c044992e1580dbbc)
Donald Chai [Thu, 19 Oct 2017 06:51:18 +0000 (23:51 -0700)]
AAPT2: Sanitize resource qualifiers before using in split names.
Fixes:
67960909
Test: UtilTest.SplitNamesAreSanitized
Change-Id: I9ba1b8430a00cc7ce981075a60388f275c41dbea
(cherry picked from commit
b8f078c9a0c9f32ad84c475c26299ecb00962ffa)
(cherry picked from commit
50bae79111afcdb8d36d73cac15155cb61df2dc0)
android-build-team Robot [Thu, 26 Oct 2017 20:02:18 +0000 (20:02 +0000)]
Snap for
4417144 from
4745025d36ce428dce07ef13ee6039f7234ea087 to oc-m2-release
Change-Id: I3e3c4343b9aae5ddbc205a1f28470a5fe9e1247c
android-build-team Robot [Wed, 25 Oct 2017 21:04:00 +0000 (21:04 +0000)]
Merge cherrypicks of [
3120219,
3121602,
3124243,
3125180] into oc-mr1-release
Change-Id: Iba119bfeb023f798076d19b82546db78ab06edb5
Christine Franks [Wed, 25 Oct 2017 02:04:22 +0000 (19:04 -0700)]
DO NOT MERGE - Support native and srgb for night display
Bug:
68159303
Test: make -j100
Change-Id: Iea4b38bd8c9037f50b7ffa6e3c4f12b0e536a8ce
(cherry picked from commit
8c9f91eba618c1fc5ad7f7ddef2b8854d4d10fce)
android-build-team Robot [Wed, 25 Oct 2017 05:32:01 +0000 (05:32 +0000)]
Merge cherrypicks of [
3122088,
3121430,
3119129,
3119130,
3119131,
3120667] into oc-mr1-release
Change-Id: I27e7d8f0f1dc1d73083eb6949e0c40d1ed77445c
Romain Guy [Tue, 24 Oct 2017 20:37:34 +0000 (21:37 +0100)]
Add color mode setting
The new setting appears on devices that support color management
and wide color gamut rendering. The setting allows the user to
choose between natural (sRGB), boosted (sRGB + 10% saturation)
and saturated (unmanaged colors; colors are remapped to the device's
native gamut).
This change adds a metric constant for analytics in Settings
and uses a persistent system property to know when to suppress
color management.
Bug:
68159303
Test: manual
Change-Id: I83cc972fc3a2290ff106eae0e76a3ee799503813
(cherry picked from commit
62e8c175257d25c64ed19e5ccccd4e3cd987b8ad)
android-build-team Robot [Mon, 23 Oct 2017 02:35:29 +0000 (02:35 +0000)]
Snap for
4411005 from
6575d483cc12747e8f6790e369ed59c15e3ff91a to oc-mr1-release
Change-Id: I5ec74e6de18301999f2140642016f85fda1d6a6a
TreeHugger Robot [Fri, 20 Oct 2017 17:44:58 +0000 (17:44 +0000)]
Merge "Fix netlink group mismatch in fds used for offload" into oc-mr1-dev
Niranjan Pendharkar [Wed, 18 Oct 2017 23:58:25 +0000 (16:58 -0700)]
Fix netlink group mismatch in fds used for offload
Existing groups used for binding to netlink conntrack events don't
seem to work as expected. Fix this by using exact groups defined
in IOffloadConfig hal.
Test: as follows
- Compiles and boots on walleye
- Validated conntrack destroy events are received as expected.
- Validated offload works as expected.
Bug:
68018148
CRs-fixed:
2126789
Merged-In: I2dcebec1c08bb7b067621331533d8a65dd7b5083
Merged-In: I96d6d5601aff009879f452975be91b6e7e40bb57
Change-Id: I76178fd7f109b82a4e4961347b8949937813d71d
(cherry picked from commit
f10282b830af4c7ea56b2c64e73a7ffd3c006007)
android-build-team Robot [Fri, 20 Oct 2017 07:17:57 +0000 (07:17 +0000)]
Snap for
4407597 from
7bd96d32a17553cf5772c7abf5a759636bcc4943 to oc-mr1-release
Change-Id: I9e76506b991d8147e5b6a5a3dbcc3e16ed825def
Jonathan Basseri [Fri, 20 Oct 2017 02:50:35 +0000 (02:50 +0000)]
Merge "DO NOT MERGE Revert "Convert ICarrierService to oneway."" into oc-mr1-dev
Jeff Sharkey [Fri, 20 Oct 2017 01:48:46 +0000 (01:48 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2 am:
34e4628cfb am:
76d9732106 am:
af70ac2914 -s ours am:
571c8a4507
am:
45829c0c41
Change-Id: I9c80ad1cde980004a625ba7a0df579c7432d14ae
Jeff Sharkey [Fri, 20 Oct 2017 01:33:20 +0000 (01:33 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2 am:
b049f43f9b am:
1b40397eb0 am:
00183554a9 -s ours am:
61d6dd8185
am:
438ed4369d
Change-Id: I467f1f279116602880a6533cadf0dc7721bdfe88
Jeff Sharkey [Fri, 20 Oct 2017 01:26:22 +0000 (01:26 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2 am:
34e4628cfb am:
76d9732106 am:
af70ac2914 -s ours
am:
571c8a4507
Change-Id: Ie4e871d2017d505461027c376946e2034105062a
Siyamed Sinir [Fri, 20 Oct 2017 01:17:09 +0000 (01:17 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9 am:
bf5b9d7e8e am:
9f073ee9fd am:
c257b61ec2 am:
21bdeacae7 am:
6ecad744a9
am:
289db3b4f3
Change-Id: I71991fe9cd3b442dff4ce84657cd84936511a8b2
Jeff Sharkey [Fri, 20 Oct 2017 01:11:01 +0000 (01:11 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2 am:
b049f43f9b am:
1b40397eb0 am:
00183554a9 -s ours
am:
61d6dd8185
Change-Id: I9b862fb8aa4858bf57aa390c7d54a65bb19d12fd
Siyamed Sinir [Fri, 20 Oct 2017 00:58:26 +0000 (00:58 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9 am:
bf5b9d7e8e am:
9f073ee9fd am:
c257b61ec2 am:
21bdeacae7
am:
6ecad744a9
Change-Id: I11a06f501b8278c356e7c2072c00b7d86470a64a
Jeff Sharkey [Fri, 20 Oct 2017 00:57:09 +0000 (00:57 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2 am:
34e4628cfb am:
76d9732106
am:
af70ac2914 -s ours
Change-Id: Ie750d6963f29c0f60a6e2e4ef2a0e8fa4201e06a
Jeff Sharkey [Fri, 20 Oct 2017 00:46:57 +0000 (00:46 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2 am:
34e4628cfb
am:
76d9732106
Change-Id: Idfdb3ab78f68d6b41d99bca533045118cc34574e
Jeff Sharkey [Fri, 20 Oct 2017 00:40:14 +0000 (00:40 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2 am:
b049f43f9b am:
1b40397eb0
am:
00183554a9 -s ours
Change-Id: I6ff359477121027efd13e82ce530a4fce32d3564
Beverly Tai [Fri, 20 Oct 2017 00:36:59 +0000 (00:36 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1 am:
260ef208ac -s ours am:
b6ecd1f88a
am:
f2e1ef2297
Change-Id: I99d77a01bbd5992effb98cc2cec15a27ab78d223
Jeff Sharkey [Fri, 20 Oct 2017 00:31:27 +0000 (00:31 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2 am:
b049f43f9b
am:
1b40397eb0
Change-Id: If7bafe99a0d9563f9c09f5632b6e023ee328ffdb
Siyamed Sinir [Fri, 20 Oct 2017 00:27:10 +0000 (00:27 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9 am:
bf5b9d7e8e am:
9f073ee9fd am:
c257b61ec2
am:
21bdeacae7
Change-Id: I3c633755286caa3ae6538581bc05a8374a8ef691
Jeff Sharkey [Fri, 20 Oct 2017 00:22:39 +0000 (00:22 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2
am:
34e4628cfb
Change-Id: I0b37777cbd94bb4c3bc60315aff3a2ebc324273c
Beverly Tai [Fri, 20 Oct 2017 00:17:11 +0000 (00:17 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1 am:
260ef208ac -s ours
am:
b6ecd1f88a
Change-Id: Id7edf88371f89d5ff9a4aad06c25cd133eb17415
Siyamed Sinir [Fri, 20 Oct 2017 00:12:31 +0000 (00:12 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9 am:
bf5b9d7e8e am:
9f073ee9fd
am:
c257b61ec2
Change-Id: I5369e96fe95e0db7206c61bb1af5b140a788890a
Jeff Sharkey [Fri, 20 Oct 2017 00:06:43 +0000 (00:06 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8
am:
832890f6e2
Change-Id: Ie3d4564dc4d4790f6cae5cbef45c47aa2eb5000a
Jeff Sharkey [Fri, 20 Oct 2017 00:03:14 +0000 (00:03 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2
am:
b049f43f9b
Change-Id: Id6f534c7fb34dcd7a16478de7a0de80688322d47
Suprabh Shukla [Fri, 20 Oct 2017 00:01:26 +0000 (00:01 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9 am:
02d89a3c0c am:
14164f1bdf
am:
7078aaa62a
Change-Id: I00826913bfa33d529b3056c7d4a2b4a9215172d8
Beverly Tai [Thu, 19 Oct 2017 23:52:10 +0000 (23:52 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1
am:
260ef208ac -s ours
Change-Id: If5929149e8173cd14c15e9d4d6e513e10f96f876
Jeff Sharkey [Thu, 19 Oct 2017 23:50:34 +0000 (23:50 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours
am:
73a4e88df8
Change-Id: I4ea13f580157d2985890d2115fdfc0a38f31e614
Siyamed Sinir [Thu, 19 Oct 2017 23:47:49 +0000 (23:47 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9 am:
bf5b9d7e8e
am:
9f073ee9fd
Change-Id: I6d9c5637245a5e242761d8368aea06a4cbfbd013
Jeff Sharkey [Thu, 19 Oct 2017 23:46:05 +0000 (23:46 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81
am:
3c30346de2
Change-Id: Ib4bfd2cde222e01e876d9b4ffc3a2135037c860d
Suprabh Shukla [Thu, 19 Oct 2017 23:43:16 +0000 (23:43 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9 am:
02d89a3c0c
am:
14164f1bdf
Change-Id: I6bea094bde1b97604d7769646d9b04f7e6b21ca2
Beverly Tai [Thu, 19 Oct 2017 23:37:21 +0000 (23:37 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16
am:
4dd01948c1
Change-Id: I7426cd9b8f68f80a924662b4870558974bad347b
Jeff Sharkey [Thu, 19 Oct 2017 23:31:46 +0000 (23:31 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours
am:
7f00f14d81
Change-Id: I79f42935ccfa12f7a5e5d22957a06f50825e2dcf
Siyamed Sinir [Thu, 19 Oct 2017 23:29:06 +0000 (23:29 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9
am:
bf5b9d7e8e
Change-Id: Iffbe5920dbe7406a8e895901dd8cc097f22c397e
Jeff Sharkey [Thu, 19 Oct 2017 23:26:57 +0000 (23:26 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693
am:
3bb6994a0b -s ours
Change-Id: I5b8a2b5df614aa4abe813e48ebf030d15dbf0202
Suprabh Shukla [Thu, 19 Oct 2017 23:22:43 +0000 (23:22 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9
am:
02d89a3c0c
Change-Id: If82c97668497ce72ad29b055b15646291df66157
Jeff Sharkey [Thu, 19 Oct 2017 23:17:45 +0000 (23:17 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b
am:
1455bd6492 -s ours
Change-Id: I2e15595d4e8f797d5b5606a5298ac50b83cf581b
Jeff Sharkey [Thu, 19 Oct 2017 23:17:05 +0000 (23:17 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9
am:
2f8dbe9693
Change-Id: I5cd93d250ea8c6cd45616aaafabd0eda68da4538
Siyamed Sinir [Thu, 19 Oct 2017 23:15:25 +0000 (23:15 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994
am:
4afdfec2d9
Change-Id: Ica998b67cb1a0d94767863f17c292eca7083b780
Beverly Tai [Thu, 19 Oct 2017 23:11:55 +0000 (23:11 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294
am:
791d8a5b16
Change-Id: I0678613fd0293afeafa38c4ac9fb0a55fb4b3969
Suprabh Shukla [Thu, 19 Oct 2017 23:09:02 +0000 (23:09 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9
am:
29257874f9
Change-Id: I3852ef99532b956fd3280c49d6722c2aed1d79a6
Jeff Sharkey [Thu, 19 Oct 2017 23:06:16 +0000 (23:06 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7
am:
901c587c6b
Change-Id: I3e721dc6183024b73b70d1f30363983a7afaf6d1
Siyamed Sinir [Thu, 19 Oct 2017 23:03:18 +0000 (23:03 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f
am:
74b3298994
Change-Id: If2e11ec2b732d2295484d489eabf7ae183c30038
Jeff Sharkey [Thu, 19 Oct 2017 22:58:37 +0000 (22:58 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb
am:
9c441159f9
Change-Id: I3533fdd4683cb85f66e107c3b4038f1a7ec97dfc
Beverly Tai [Thu, 19 Oct 2017 22:56:23 +0000 (22:56 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef
am:
5fda53b294
Change-Id: Idda35731b13787fb00e0c7474eebc5b7d8660251
Suprabh Shukla [Thu, 19 Oct 2017 22:54:42 +0000 (22:54 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55
am:
a4454ba4a9
Change-Id: Ie24e5fc3ab442ca5c51ca79687d417ae563d631c
Siyamed Sinir [Thu, 19 Oct 2017 22:51:30 +0000 (22:51 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d
am:
4c7113461f
Change-Id: If52cdfdbd9e3eee06a109a5b4f1bff82d9506b73
Jeff Sharkey [Thu, 19 Oct 2017 22:44:02 +0000 (22:44 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549
am:
563ea682e7
Change-Id: I393058caae6a8cc446597509b20241723f22a238
Suprabh Shukla [Thu, 19 Oct 2017 22:40:05 +0000 (22:40 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b
am:
d1150b7e55
Change-Id: Iac842a9f018f24c905d4e165362f5bf87470d296
Beverly Tai [Thu, 19 Oct 2017 22:39:14 +0000 (22:39 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours
am:
bcdb9079ef
Change-Id: Id065bc6f31814aed56fce0ddd9a1b6378d9364ee
Siyamed Sinir [Thu, 19 Oct 2017 22:34:08 +0000 (22:34 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3
am:
63bb54738d
Change-Id: Ie5bd667854712446924704bc839e80bb66d06a63
Jeff Sharkey [Thu, 19 Oct 2017 22:32:13 +0000 (22:32 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours
am:
08bd3a75fb
Change-Id: I18e61b7280df672c91bb076f3ed894f895e075a0
Jeff Sharkey [Thu, 19 Oct 2017 22:25:25 +0000 (22:25 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours
am:
b52056d549
Change-Id: I520162dc90c1855d0a6324e62507f78d6ce5b329
Suprabh Shukla [Thu, 19 Oct 2017 22:25:04 +0000 (22:25 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1
am:
55ffaea04b
Change-Id: I10a7a16d5463e4cbf7880b1979541ea82a56ddd3
Beverly Tai [Thu, 19 Oct 2017 22:20:11 +0000 (22:20 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb
am:
7b1157a92e -s ours
Change-Id: I0e451cfd8bf662d959ace4f79b1181d27fce79e1
Siyamed Sinir [Thu, 19 Oct 2017 22:16:30 +0000 (22:16 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours
am:
1c7cdde2d3
Change-Id: Iee9737ebbb5e9f3d476ddb54d9ae9898b2d01d14
Jeff Sharkey [Thu, 19 Oct 2017 22:14:01 +0000 (22:14 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours
am:
edb6b17ebc -s ours
Change-Id: Ie31aff669dfbabd860c123d4448362af4903973d
Jeff Sharkey [Thu, 19 Oct 2017 22:10:20 +0000 (22:10 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am:
1f2a5d3622 -s ours
Change-Id: I2bf88a0e4808e7d3db67e7944696121c284ed7ae
Suprabh Shukla [Thu, 19 Oct 2017 22:06:31 +0000 (22:06 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06
am:
cf8fe172a1
Change-Id: I8600883ef4cad6f8b11fc005fc9cfd62d84aeb08
Beverly Tai [Thu, 19 Oct 2017 22:06:02 +0000 (22:06 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c
am:
06bd19c1fb
Change-Id: I6f6cb9cf71ba1584b162d6b18c28c2825323e7be
Siyamed Sinir [Thu, 19 Oct 2017 22:04:10 +0000 (22:04 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b
am:
9e5a4ed6c3 -s ours
Change-Id: Ie6822b787e5777688faadcf125637b9c66c202de
Suprabh Shukla [Thu, 19 Oct 2017 21:55:31 +0000 (21:55 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef
am:
8fb52c8d06
Change-Id: I2d8cdac51baf7b8df6b903f0416e525e9ec44784
Beverly Tai [Thu, 19 Oct 2017 21:50:59 +0000 (21:50 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b
am:
d7ece4da2c
Change-Id: Icfd3af47bed5a40d23d1a48ecbb654625898ca2f
Suprabh Shukla [Thu, 19 Oct 2017 21:41:08 +0000 (21:41 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5
am:
6f0e6952ef
Change-Id: Ie4cf94614784c4938776c8c6c37fff64e6cfa240
Beverly Tai [Thu, 19 Oct 2017 21:35:03 +0000 (21:35 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours
am:
dfbaa1fd8b
Change-Id: I3bcc1adb52f00e95ef31dc17fc29b2e0242bc753
TreeHugger Robot [Thu, 19 Oct 2017 21:31:10 +0000 (21:31 +0000)]
Merge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev
Suprabh Shukla [Thu, 19 Oct 2017 21:25:06 +0000 (21:25 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours
am:
159648d6e5
Change-Id: I34260f4fd841084a9e91b89905d84004efb40b23
Beverly Tai [Thu, 19 Oct 2017 21:18:55 +0000 (21:18 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev
am:
f2b592726d -s ours
Change-Id: Idd1243bb1cddc91f34f6e47e9cea88b72cff29d0
Suprabh Shukla [Thu, 19 Oct 2017 20:57:26 +0000 (20:57 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28
am:
8b438236ce -s ours
Change-Id: Ib8c3a4e6e8e39e42aa640c9988d0dd2022f486ec
Jonathan Basseri [Thu, 19 Oct 2017 16:22:08 +0000 (16:22 +0000)]
DO NOT MERGE Revert "Convert ICarrierService to oneway."
This reverts commit
49b54d64ca5c2aa08021c2ad747597cdd4486ad8.
Bug:
63400667
Change-Id: Ica0696bf4ae3f9a84f0e4ad6e1207374696e9497
jackqdyulei [Thu, 19 Oct 2017 18:05:09 +0000 (11:05 -0700)]
Reuse the BluetoothBatteryDrawable in QS detail
BluetoothBatteryDrawable creates the drawable lazily using
the latest(and most correct) context. So it could get the
correct color from the theme.
Also add iconScale field in BluetoothBatteryDrawable so the size
of the battery icon could be scaled.
Bug:
67377756
Test: Manual - connected to bluetooth headphone and open the qs
page and detail page. Retest it after changing it to dark theme.
Change-Id: Ic6c871985a89a503221755eed4bc2605ab53f630
TreeHugger Robot [Thu, 19 Oct 2017 15:52:22 +0000 (15:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Thu, 19 Oct 2017 08:21:34 +0000 (01:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I359b63c9efc317b1a6053d73321a3769871efbf3
android-build-team Robot [Thu, 19 Oct 2017 06:09:55 +0000 (06:09 +0000)]
Snap for
4404534 from
ea0b574ea52a875359bb545a8c6e3245d676bb96 to oc-mr1-release
Change-Id: If49188c0ebf6a8e25391d9eebb764884b134cabb
Beverly Tai [Thu, 19 Oct 2017 03:58:35 +0000 (03:58 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3 am:
c6ca9254ed am:
7fd4bec14a am:
b00fd6bb97 am:
93d9ac257d -s ours am:
1ce0456b99
am:
a9d3b4d806
Change-Id: Id867bdf6b1756dd2a1cf8a9229d61125aeccf463
Siyamed Sinir [Thu, 19 Oct 2017 03:43:31 +0000 (03:43 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c am:
19a3c53841 am:
9950579eb5 am:
8621a28b04 am:
685b515140 am:
65f1a4c4c2
am:
b614e5560e
Change-Id: If3c96f55d78b11e7372ca8783cf41f9a50984faa
Beverly Tai [Thu, 19 Oct 2017 03:34:46 +0000 (03:34 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3 am:
c6ca9254ed am:
7fd4bec14a am:
b00fd6bb97 am:
93d9ac257d -s ours
am:
1ce0456b99
Change-Id: I9650a76a4f2dacb2c37e8232409e03c8745383f7
Siyamed Sinir [Thu, 19 Oct 2017 03:22:50 +0000 (03:22 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c am:
19a3c53841 am:
9950579eb5 am:
8621a28b04 am:
685b515140
am:
65f1a4c4c2
Change-Id: I97965f18ce2146b65542ef8c2125c88c024c67c8
TreeHugger Robot [Thu, 19 Oct 2017 03:16:48 +0000 (03:16 +0000)]
Merge "Preserve ranking attrs of resolve infos for installing a feature split" into oc-mr1-dev
Beverly Tai [Thu, 19 Oct 2017 03:06:40 +0000 (03:06 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3 am:
c6ca9254ed am:
7fd4bec14a am:
b00fd6bb97
am:
93d9ac257d -s ours
Change-Id: Ic1a98303821102d3cddbdbf52b98f2739c2507f6
Siyamed Sinir [Thu, 19 Oct 2017 03:00:17 +0000 (03:00 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c am:
19a3c53841 am:
9950579eb5 am:
8621a28b04
am:
685b515140
Change-Id: I42139be71b55e6a9a7c88b97cd99936216541cc3
Beverly Tai [Thu, 19 Oct 2017 02:59:41 +0000 (02:59 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3 am:
c6ca9254ed am:
7fd4bec14a
am:
b00fd6bb97
Change-Id: Ie1ed5edaabe4cf6206764c0f343a70eb588009c5
Siyamed Sinir [Thu, 19 Oct 2017 02:49:27 +0000 (02:49 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c am:
19a3c53841 am:
9950579eb5
am:
8621a28b04
Change-Id: Ifac3ab83e23f93d8f0834029b44ec8f32bbab243
Beverly Tai [Thu, 19 Oct 2017 02:48:23 +0000 (02:48 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3 am:
c6ca9254ed
am:
7fd4bec14a
Change-Id: Iadf94c4dcda9ae3e7a068838de87a4fadc18be7f
Siyamed Sinir [Thu, 19 Oct 2017 02:37:50 +0000 (02:37 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c am:
19a3c53841
am:
9950579eb5
Change-Id: I9019cab591a3729592ddd142867f6b3f0c40c369
Beverly Tai [Thu, 19 Oct 2017 02:37:19 +0000 (02:37 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3
am:
c6ca9254ed
Change-Id: I8715d787f890827442c098b7ef5c93c563e4246e
Siyamed Sinir [Thu, 19 Oct 2017 02:26:01 +0000 (02:26 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c
am:
19a3c53841
Change-Id: I20e8fba8fe69c10c5cbdd1a1d3db27a20a206e51
Beverly Tai [Thu, 19 Oct 2017 02:25:35 +0000 (02:25 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours
am:
f1a95220a3
Change-Id: Icccff07eedee53fdc20c40d62e41b40af0b4992f
Suprabh Shukla [Thu, 19 Oct 2017 02:16:29 +0000 (02:16 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3 am:
d1e7db9f4a am:
9ecbe6f6e7 am:
a9e9e83964 am:
f580b0f6a4
am:
2bded32359
Change-Id: I61b5f44bbddc391303dfec7e64895d83c588f7f8
Siyamed Sinir [Thu, 19 Oct 2017 02:12:01 +0000 (02:12 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa
am:
69cc90b01c
Change-Id: Ia0630be45dfa4778b204585002c299c847d32366
Beverly Tai [Thu, 19 Oct 2017 02:09:14 +0000 (02:09 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714
am:
9b0a6a3509 -s ours
Change-Id: I8a0b0468b053f31a5e28b335cfdd68d7adf7e4b5
Beverly Tai [Thu, 19 Oct 2017 02:03:19 +0000 (02:03 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d
am:
d34366e714
Change-Id: I1574e30ff64f6c7a691e8f4e1e4110cb0af9ee81
Suprabh Shukla [Thu, 19 Oct 2017 01:59:51 +0000 (01:59 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3 am:
d1e7db9f4a am:
9ecbe6f6e7 am:
a9e9e83964
am:
f580b0f6a4
Change-Id: Ie647ac50b0d312df13a163005c2a7bbfd8a4a26e
Siyamed Sinir [Thu, 19 Oct 2017 01:58:22 +0000 (01:58 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006
am:
2bab19f9aa
Change-Id: I3ee3147762e5ad8d72f4478d87800a35639228e0