OSDN Git Service
TreeHugger Robot [Mon, 30 Oct 2017 06:49:07 +0000 (06:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 30 Oct 2017 06:48:16 +0000 (06:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 30 Oct 2017 06:44:09 +0000 (06:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 30 Oct 2017 06:43:27 +0000 (06:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 30 Oct 2017 06:39:40 +0000 (06:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sun, 29 Oct 2017 16:50:30 +0000 (09:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I6fd17c5a36e39a9a2009b6da91b7bc9aa1d7a251
Bill Yi [Sun, 29 Oct 2017 15:05:49 +0000 (08:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: If774e276d4d0e78233d6b22edbf33900ef866390
Bill Yi [Sun, 29 Oct 2017 14:33:12 +0000 (07:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic418f5712f192bb12d935713042b22b124817725
Bill Yi [Sun, 29 Oct 2017 14:25:41 +0000 (07:25 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I837b9a3c84d21544715855d80fc04af6fddf7b95
Bill Yi [Sun, 29 Oct 2017 14:17:58 +0000 (07:17 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I8f07e45a24fa38ff073987f7750f69a18499bf48
Bill Yi [Sun, 29 Oct 2017 04:52:30 +0000 (21:52 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I2bf31993c0e7b7d6afec824c0163c85097a8c89c
TreeHugger Robot [Sat, 28 Oct 2017 02:45:48 +0000 (02:45 +0000)]
Merge "Minor fixes on SaveInfo javadoc." into oc-mr1-dev
Andrew Solovay [Sat, 28 Oct 2017 01:49:32 +0000 (01:49 +0000)]
Merge "docs: Typo fixes" into oc-mr1-dev
Felipe Leme [Thu, 26 Oct 2017 16:23:43 +0000 (09:23 -0700)]
Minor fixes on SaveInfo javadoc.
Test: ran 'mmm -j108 frameworks/base/:doc-comment-check-docs' and checked HTML
Bug:
68402851
Merged-in: I9ba776be77132942d516d23ac69d3ad9f9b3da62
Change-Id: I9ba776be77132942d516d23ac69d3ad9f9b3da62
Andrew Solovay [Fri, 27 Oct 2017 22:11:48 +0000 (15:11 -0700)]
docs: Typo fixes
See first comment for doc stage location.
Change-Id: I29661ffab0ff10021671df0b725c9f9b12430960
Bug:
67886596
Bug:
67932414
Test: make ds-docs
Guang Zhu [Thu, 26 Oct 2017 00:04:25 +0000 (17:04 -0700)]
limit the verbosity of app crash failure message
- reporting full dropbox content for all detected crashes leads
to overly verbose test failure message
Bug:
67002148
Test: http://sponge/
4ff3ccb5-c455-45e2-9614-
d3527e1f711d
Change-Id: Ic2cd2ba4ce2af0954f186b196c18cc76c19f2007
Daniel Sandler [Fri, 27 Oct 2017 14:39:01 +0000 (14:39 +0000)]
Merge "Give fg services a shelf life before they go bad." into oc-mr1-dev
Dan Sandler [Fri, 27 Oct 2017 03:27:57 +0000 (23:27 -0400)]
Give fg services a shelf life before they go bad.
When a fg service starts (as indicated by its presence in a
NOTE_FOREGROUND_SERVICES notification), we note the service
start time (as encoded in Notification.when in ActivityMgr).
SysUI will suppress the dungeon (foreground service
disclosure) notification until 5 seconds have elapsed since
the earliest service start time. After that, if the service
is still running, the disclosure will be shown.
Bug:
67819284
Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java
Change-Id: I5b6df95eb673e2f551aaa3ecc5a7df617f815a90
TreeHugger Robot [Fri, 27 Oct 2017 10:20:09 +0000 (10:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Fri, 27 Oct 2017 06:27:26 +0000 (23:27 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I752d240f2a039f727edac641136078ddee540e34
Android Build Merger (Role) [Fri, 27 Oct 2017 03:25:38 +0000 (03:25 +0000)]
Merge "Merge "Support native and srgb for night display" into oc-dr1-dev am:
37082aa53e -s ours" into oc-mr1-dev
Christine Franks [Fri, 27 Oct 2017 03:23:01 +0000 (03:23 +0000)]
Merge "Support native and srgb for night display" into oc-dr1-dev
am:
37082aa53e -s ours
Change-Id: I6a7d3864db78ac95a175cc9097a821daa6ea6658
Chad Brubaker [Fri, 27 Oct 2017 03:22:39 +0000 (03:22 +0000)]
Merge "Allow internal services access to instant apps" into oc-mr1-dev
Jason Monk [Fri, 27 Oct 2017 03:15:58 +0000 (03:15 +0000)]
Merge changes from topic "b-
68279369" into oc-dr1-dev
am:
885bf1302e -s ours
Change-Id: Ia35e09b9935da7bd63f08afd82dac950a9acd344
TreeHugger Robot [Fri, 27 Oct 2017 01:07:19 +0000 (01:07 +0000)]
Merge "ActivityManager: Change documentation of low RAM" into oc-mr1-dev
Romain Guy [Fri, 27 Oct 2017 00:07:58 +0000 (00:07 +0000)]
Add color mode setting
am:
af5e11245d -s ours
Change-Id: I57d6a2503f28fb8c26ac0e5e644306bbe812a347
TreeHugger Robot [Thu, 26 Oct 2017 22:47:34 +0000 (22:47 +0000)]
Merge "Support native and srgb for night display" into oc-dr1-dev
TreeHugger Robot [Thu, 26 Oct 2017 22:17:40 +0000 (22:17 +0000)]
Merge changes from topic "b-
68279369" into oc-dr1-dev
* changes:
Auto-dim refinements
Refinement of auto-dimming nav
Don't touch auto dim on app change
Auto dim the nav bar to help prevent diff aging
Christine Franks [Wed, 25 Oct 2017 02:04:22 +0000 (19:04 -0700)]
Support native and srgb for night display
Bug:
68159303
Test: make -j100
Merged-In: Iea4b38bd8c9037f50b7ffa6e3c4f12b0e536a8ce
Change-Id: Iea4b38bd8c9037f50b7ffa6e3c4f12b0e536a8ce
Jason Monk [Fri, 13 Oct 2017 14:34:40 +0000 (10:34 -0400)]
Auto-dim refinements
- Don't auto-dim while wallpaper is showing
- Up alpha to 60%
Change-Id: Ie5fc33279ca46f7de37befacbbd7b42b7d4e5d15
Fixes:
67735001
Test: manual
Jason Monk [Mon, 18 Sep 2017 14:31:37 +0000 (10:31 -0400)]
Refinement of auto-dimming nav
- Make dimming only happen for interaction with nav
- Extend time to dim
- Shorten time to start dimming by same amount.
Test: visual
Change-Id: Ieb5b31bacdde9ce1952601ad65cff2d54386dd0f
Fixes:
65694001
Jason Monk [Wed, 30 Aug 2017 20:17:19 +0000 (16:17 -0400)]
Don't touch auto dim on app change
Test: manual
Bug:
63630024
Change-Id: I134aa2695bad36606588ca3e52685826f25ea306
Jason Monk [Tue, 29 Aug 2017 22:58:00 +0000 (18:58 -0400)]
Auto dim the nav bar to help prevent diff aging
Test: runtest systemui
Bug:
63630024
Change-Id: If2a6c0934f8751f82c027dbb3b5f103a34dc78d4
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
Merged-In: I83cc972fc3a2290ff106eae0e76a3ee799503813
Change-Id: I83cc972fc3a2290ff106eae0e76a3ee799503813
(cherry picked from commit
62e8c175257d25c64ed19e5ccccd4e3cd987b8ad)
Greg Kaiser [Thu, 26 Oct 2017 17:36:37 +0000 (10:36 -0700)]
ActivityManager: Change documentation of low RAM
With OC-MR1, for Android Go, we're considering the definition of
"low RAM" to be <= 1GB of RAM. So we update the definition in
this documentation. Additionally, we remove the comments about
screen resolution, as various devices might make trade-offs in
terms of modem stack carveout vs. screen resolution, and those
don't concern us as much as just the total amount of RAM.
Bug:
68277942
Test: None. This is a documentation change.
Change-Id: Ib02024a3e543f8fec11a1735de32ec58278db6e4
Christine Franks [Wed, 25 Oct 2017 20:15:17 +0000 (20:15 +0000)]
Merge "DO NOT MERGE - Support native and srgb for night display" into oc-mr1-dev
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
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
Andrew Solovay [Wed, 25 Oct 2017 16:05:50 +0000 (16:05 +0000)]
Merge "docs: Fixing P1 formatting problem on Javadocs" into oc-mr1-dev
Dave Friedman [Wed, 25 Oct 2017 06:59:38 +0000 (06:59 +0000)]
Merge "Docs: Adds brief instructions for how to do Wi-Fi scan. Bug:
67967771 Test: Ran make ds-docs." into oc-dev am:
44cd5b97ad
am:
25c008d9b1
Change-Id: I740781c9ddd2207d15ea285748c9971139fe50ad
Dave Friedman [Wed, 25 Oct 2017 06:48:22 +0000 (06:48 +0000)]
Merge "Docs: Adds brief instructions for how to do Wi-Fi scan. Bug:
67967771 Test: Ran make ds-docs." into oc-dev
am:
44cd5b97ad
Change-Id: I228d7395c9de8e164a0110c0d4fdf4530c7690ec
TreeHugger Robot [Wed, 25 Oct 2017 06:22:54 +0000 (06:22 +0000)]
Merge "Docs: Adds brief instructions for how to do Wi-Fi scan. Bug:
67967771 Test: Ran make ds-docs." into oc-dev
Chia-I Wu [Wed, 25 Oct 2017 04:28:58 +0000 (04:28 +0000)]
Merge "Add color mode setting" into oc-mr1-dev
Andrew Solovay [Tue, 24 Oct 2017 23:59:56 +0000 (23:59 +0000)]
Merge "docs: Correct labeling for two USB events" into oc-mr1-dev
TreeHugger Robot [Tue, 24 Oct 2017 23:17:34 +0000 (23:17 +0000)]
Merge "AAPT: treat "-I" with lower precedence than main APK for dumping." into oc-mr1-dev
Andrew Solovay [Tue, 24 Oct 2017 21:44:46 +0000 (14:44 -0700)]
docs: Fixing P1 formatting problem on Javadocs
The summary sentence for T3PmmFilter didn't end with a period,
which broke the field's line in the summary table, *and* everything
after it in the Javadoc. (See
https://screenshot.googleplex.com/ByBvpYvXjwp.png)
Think this should go in for MR1 DP1 if at all possible.
See first comment for doc stage location.
Bug:
68212949
Test: make ds-docs
Change-Id: I3365c4ce0eaf6a91dde28a4b71249047317fcb5d
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
Andrew Solovay [Tue, 24 Oct 2017 18:20:38 +0000 (11:20 -0700)]
docs: Correct labeling for two USB events
Per bug, these were mislabeled as broadcast actions, when they're
actually activity intents. This has consequences post-O, since
broadcast actions are now subject to limitations.
Doc is staged to:
http://go/dac-stage/reference/android/hardware/usb/UsbManager.html
Bug:
36672976
Test: make ds-docs
Change-Id: I2b515b1ac152de389f952af21166ed2ba7843044
Tenghui Zhu [Tue, 24 Oct 2017 16:22:49 +0000 (16:22 +0000)]
Merge "AAPT leave <gradient> alone for VDC" into oc-mr1-dev
TreeHugger Robot [Tue, 24 Oct 2017 11:16:03 +0000 (11:16 +0000)]
Merge "AAPT2: Sanitize resource qualifiers before using in split names." into oc-mr1-dev
Dave Friedman [Wed, 4 Oct 2017 23:26:10 +0000 (16:26 -0700)]
Docs: Adds brief instructions for how to do Wi-Fi scan.
Bug:
67967771
Test: Ran make ds-docs.
We don't actually document how to do a Wi-Fi scan anywhere on DAC;
at the moment, this seems like the place where it makes the most sense
to provide that guidance.
The forcing function for doing this is that a new doc explicitly
recommends that devs do Wi-Fi scans in certain cases, but doesn't
have a place to link to that tells them how to do so. That doc
plans to send readers here.
Change-Id: Ic35fb77d323e825e5bd5b4eec2716730f0d531e1
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)
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
OSDN Git Service
