OSDN Git Service
Adrian Roos [Mon, 16 Apr 2018 16:16:56 +0000 (09:16 -0700)]
Merge changes I478047cc,Ibe16ffd7 into pi-dev
am:
892ee93977
Change-Id: Id60ec23a210c907bf61a4f0c95441e5f48b773cc
Makoto Onuki [Mon, 16 Apr 2018 16:08:35 +0000 (09:08 -0700)]
Merge "Skip cross-user/profile check for start activity pending intents." into pi-dev
am:
8f9fce0680
Change-Id: Ifb0325feb6c9a73a50c8ffe0f6e2b774966fa6fb
TreeHugger Robot [Mon, 16 Apr 2018 16:07:27 +0000 (16:07 +0000)]
Merge changes I478047cc,Ibe16ffd7 into pi-dev
* changes:
DisplayCutout: Ensure stable insets cover top cutout
Cutout: Use stable density for inflating simulated cutouts
Makoto Onuki [Mon, 16 Apr 2018 15:55:36 +0000 (15:55 +0000)]
Merge "Skip cross-user/profile check for start activity pending intents." into pi-dev
Makoto Onuki [Mon, 16 Apr 2018 15:51:04 +0000 (08:51 -0700)]
Merge "Fix "auto battery saver notification comes back"" into pi-dev
am:
167032ab00
Change-Id: I2f1d971f2ca72fe5b4571027182235caf15f6575
Adrian Roos [Mon, 16 Apr 2018 15:32:42 +0000 (08:32 -0700)]
Merge "Cutout: Fix broken cutout rendering in landscape" into pi-dev
am:
26c25f0033
Change-Id: I2e256085c93e9c5968477f715f4d0929e0e74f8f
Makoto Onuki [Mon, 16 Apr 2018 15:32:20 +0000 (15:32 +0000)]
Merge "Fix "auto battery saver notification comes back"" into pi-dev
David Brazdil [Mon, 16 Apr 2018 15:24:40 +0000 (08:24 -0700)]
Merge "Add more hidden API on light greylist" into pi-dev
am:
8ef1cb9d10
Change-Id: Ibe5037b353b01f7eb523a5a44112e429b230dff2
TreeHugger Robot [Mon, 16 Apr 2018 15:20:04 +0000 (15:20 +0000)]
Merge "Cutout: Fix broken cutout rendering in landscape" into pi-dev
Dan Gittik [Mon, 16 Apr 2018 15:05:23 +0000 (08:05 -0700)]
Merge "Added screen brightness override feedback." into pi-dev
am:
6ddaed5efd
Change-Id: Id73dbb9fc8286865d0bb78949f8abb585defa483
David Brazdil [Mon, 16 Apr 2018 15:04:07 +0000 (15:04 +0000)]
Merge "Add more hidden API on light greylist" into pi-dev
Benjamin Miller [Mon, 16 Apr 2018 15:01:15 +0000 (08:01 -0700)]
Merge "Doc change: removed reference to the reverted Password Blacklist feature." into pi-dev
am:
bdf8f1e3a2
Change-Id: I78270fc1f639f87c3a26ab97ec526c902ff081c7
Adrian Roos [Mon, 16 Apr 2018 14:56:07 +0000 (16:56 +0200)]
DisplayCutout: Ensure stable insets cover top cutout
Fixes an issue where the stable insets could become smaller
than the top cutout if the display density was set lower
than the natural density.
Bug:
78110564
Test: Set display size to "small", turn on cutout, verify apps do not have a gap between status bar and content.
Change-Id: I478047ccaade0e4e265cc57d03b072ae578b49d0
TreeHugger Robot [Mon, 16 Apr 2018 14:48:38 +0000 (14:48 +0000)]
Merge "Added screen brightness override feedback." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 14:48:19 +0000 (14:48 +0000)]
Merge "Doc change: removed reference to the reverted Password Blacklist feature." into pi-dev
Bill Yi [Mon, 16 Apr 2018 14:34:28 +0000 (07:34 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
3c074aacc2 -s ours
Change-Id: Ibc2f88f11d3ae8add29a60af099efc6818125662
Bill Yi [Mon, 16 Apr 2018 14:32:24 +0000 (07:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
1caec875ab -s ours
Change-Id: Ic6152a928385bfc4c32bc41aa2542266d58eb0ec
TreeHugger Robot [Mon, 16 Apr 2018 14:26:28 +0000 (14:26 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 14:22:12 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Adrian Roos [Mon, 16 Apr 2018 14:12:40 +0000 (16:12 +0200)]
Cutout: Use stable density for inflating simulated cutouts
Change-Id: Ibe16ffd792040e753d54d7085ba74e8880de111e
Fixes:
77961334
Test: Set density to Very large, enable simulated cutout, verify it still looks reasonable.
Adrian Roos [Mon, 16 Apr 2018 14:03:04 +0000 (16:03 +0200)]
Cutout: Fix broken cutout rendering in landscape
Change-Id: I835fd7fa06dfcc0eff0323efe8f2913b9e1239b8
Fixes:
77960411
Test: Simulate cutout, rotate to landscape, verify cutout is still visible.
Benjamin Miller [Mon, 16 Apr 2018 12:54:43 +0000 (12:54 +0000)]
Doc change: removed reference to the reverted Password Blacklist feature.
Bug:
73750934
Test: make ds-docs and inspected HTML output.
Change-Id: I545ef13219dc994a4f157cc6f2380eac59331498
Lucas Dupin [Mon, 16 Apr 2018 11:42:34 +0000 (04:42 -0700)]
Merge "Bouncer visibility fixes" into pi-dev
am:
606440f142
Change-Id: I14ed1a28b0ac56bcdd258cc528f7be30ae2badd8
TreeHugger Robot [Mon, 16 Apr 2018 11:30:37 +0000 (11:30 +0000)]
Merge "Bouncer visibility fixes" into pi-dev
David Brazdil [Mon, 16 Apr 2018 11:05:41 +0000 (12:05 +0100)]
Add more hidden API on light greylist
Bug:
64382372
Bug:
78019806
Bug:
77982395
Bug:
77862070
Bug:
77860747
Bug:
77785209
Bug:
77814672
Bug:
77760092
Test: make
Change-Id: I78643c355801241a2e02f16f986a7a5d14d79823
Lucas Dupin [Mon, 16 Apr 2018 06:50:20 +0000 (14:50 +0800)]
Bouncer visibility fixes
Test: go/sysui-bouncer-tests
Change-Id: Iaf6e0ded57eb3b737cfd074bbc750aa6977e36b2
Fixes:
77921840
Bill Yi [Mon, 16 Apr 2018 08:19:56 +0000 (01:19 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I458b91bd87cd73ec887a9581ed1d4d2527513bd4
Bernie Innocenti [Mon, 16 Apr 2018 07:23:28 +0000 (00:23 -0700)]
Merge "Teach ApfGenerator about the new opcodes for accessing data memory" am:
5a533ae460
am:
faf23c9281
Change-Id: Ia6fafc71380a2d05cd3d3ea019e69b8109269da1
Bernie Innocenti [Mon, 16 Apr 2018 07:12:04 +0000 (00:12 -0700)]
Merge "Teach ApfGenerator about the new opcodes for accessing data memory"
am:
5a533ae460
Change-Id: I904d482c71aa8e1b8859d2d27643592cff49ffb9
Chalard Jean [Mon, 16 Apr 2018 05:48:50 +0000 (22:48 -0700)]
Merge "Guard the SSID with NETWORK_SETTINGS" into pi-dev
am:
a7579d6325
Change-Id: Iba59e93875c28b8e30db0c013575bc2f117cb16c
TreeHugger Robot [Mon, 16 Apr 2018 05:40:17 +0000 (05:40 +0000)]
Merge "Guard the SSID with NETWORK_SETTINGS" into pi-dev
Tyler Gunn [Mon, 16 Apr 2018 05:38:14 +0000 (22:38 -0700)]
Merge "Add permission whitelist for EmergencyInfo app." am:
3fb7c4740e
am:
bd96a65d1c
Change-Id: Ie8a16b9a210ffe4bc03ccc4a722210eff14992d2
Tyler Gunn [Mon, 16 Apr 2018 05:26:00 +0000 (22:26 -0700)]
Merge "Add permission whitelist for EmergencyInfo app."
am:
3fb7c4740e
Change-Id: I69727fb3f6854c190b570ada33560c2dbf2d76c5
Bernie Innocenti [Mon, 16 Apr 2018 05:24:29 +0000 (05:24 +0000)]
Merge "Teach ApfGenerator about the new opcodes for accessing data memory"
Bill Yi [Mon, 16 Apr 2018 04:54:36 +0000 (21:54 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
214b3378e6 -s ours
Change-Id: I224cf156839a475d6f82cd4c8a7b841f0bbf0d39
TreeHugger Robot [Mon, 16 Apr 2018 04:42:35 +0000 (04:42 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Chalard Jean [Mon, 16 Apr 2018 03:25:22 +0000 (12:25 +0900)]
Guard the SSID with NETWORK_SETTINGS
Bug:
77865258
Test: manual
Change-Id: I01d4ec7366382d42847c823ae6056222a012c504
Bill Yi [Mon, 16 Apr 2018 04:29:07 +0000 (21:29 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I61e1929cbf38843fcce516c103cd51e4e03ae10c
Tyler Gunn [Mon, 16 Apr 2018 04:18:00 +0000 (04:18 +0000)]
Merge "Add permission whitelist for EmergencyInfo app."
Bill Yi [Sun, 15 Apr 2018 14:16:58 +0000 (07:16 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I5dc789af62825582ca94133ab6721152b2b6871f
Yohei Yukawa [Sun, 15 Apr 2018 04:03:46 +0000 (21:03 -0700)]
Merge "Respect light nav bar flag set by IME on keyguard" into pi-dev
am:
52842feb14
Change-Id: I7c7230e4a46efd41f7dc556cc9c698d4b5499003
HJ ChangLiao [Sun, 15 Apr 2018 03:55:24 +0000 (20:55 -0700)]
Merge "Add new category key for ConnectDeviceFrag" into pi-dev
am:
6a7190cb97
Change-Id: Iafb52f567ff23925d28f1d0356553e398471cbe8
Philip P. Moltmann [Sun, 15 Apr 2018 03:43:24 +0000 (20:43 -0700)]
[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-mr1-dev am:
4cfd9bb78d -s ours
am:
aeff32e789
Change-Id: I344703c6effcc4902d11b882056736541257f6b8
Milo Sredkov [Sun, 15 Apr 2018 03:34:19 +0000 (20:34 -0700)]
Address visual inconsistency in smart replies
am:
a5bacea405
Change-Id: I03488013ecd3c97083ecf3158e5ece5300406487
Dmitry Dementyev [Sun, 15 Apr 2018 03:26:07 +0000 (20:26 -0700)]
Merge "Don't create recovery snapshot until it contains at least one key." into pi-dev
am:
8d1ff46dfc
Change-Id: I9482195d01d157b7819674e18c04288ef3a8d3dc
TreeHugger Robot [Sun, 15 Apr 2018 02:55:53 +0000 (02:55 +0000)]
Merge "Respect light nav bar flag set by IME on keyguard" into pi-dev
Lifu Tang [Sun, 15 Apr 2018 02:47:11 +0000 (19:47 -0700)]
Merge "Add an action to launch scanning settings" into pi-dev
am:
4af3d1a4a4
Change-Id: I8e15c04b225ceb2792a2ca2d41c405922c02e482
Philip P. Moltmann [Sun, 15 Apr 2018 02:16:29 +0000 (19:16 -0700)]
Merge "(P) Revoke permision when group changed" into pi-dev
am:
7081085d6d
Change-Id: I97fd9bb2f15f7adfead96efd8475a9af0b127cf6
Brad Stenning [Sun, 15 Apr 2018 02:11:12 +0000 (19:11 -0700)]
Merge "Fix facetbuttons selection It didn't work when apps where in a virtual or secondary dispaly" into pi-dev
am:
7091b5a833
Change-Id: Ie9feb8914ec56179ee1ff0af3d5e7e7cca68c6c4
Chong Zhang [Sun, 15 Apr 2018 01:52:52 +0000 (18:52 -0700)]
Merge "Use heif embedded thumbnail if available" into pi-dev
am:
11d203ea0d
Change-Id: I99ecf1986d921c00f70e7b9dbd2a8c67c5c9a923
Jeff Sharkey [Sun, 15 Apr 2018 01:42:05 +0000 (18:42 -0700)]
Merge "Benchmarks for streams." into pi-dev
am:
59abd6aa25
Change-Id: I7512dd383285f1db91f77ea0bc981e7e745d7016
Jeff Sharkey [Sun, 15 Apr 2018 01:39:00 +0000 (18:39 -0700)]
Merge "Return "null" cycles for deprecated callers." into pi-dev
am:
9eb0a655cc
Change-Id: Ibe9928effca29598c59f440018977474debbee4b
Fyodor Kupolov [Sun, 15 Apr 2018 01:35:27 +0000 (18:35 -0700)]
Merge "Only check bg restriction if an app is idle" into pi-dev
am:
a6ee4a4970
Change-Id: I5c36cd20b4d3dbd8057a8a79b92008834221035f
Jeff Sharkey [Sun, 15 Apr 2018 01:11:58 +0000 (18:11 -0700)]
Merge "OP_GET_USAGE_STATS should be noted, not checked." into pi-dev
am:
64bbb2014e
Change-Id: I38f5aecdb94c8b886ca4eba5908ab1b4a9c1fb89
Hansong Zhang [Sun, 15 Apr 2018 00:47:05 +0000 (17:47 -0700)]
Merge "Add HFP/HearingAid set/get action device to greylist" into pi-dev
am:
6b30886afd
Change-Id: I32e6f4a9263d655650d623207350a921f1b104d8
Christopher Tate [Sun, 15 Apr 2018 00:43:16 +0000 (17:43 -0700)]
Merge "Correct lookback for while-idle alarm rate limiting" into pi-dev
am:
b80f4acec7
Change-Id: I94d662b5f7c05fb49610d045e2ad9cd7ff6f99ad
Jeff Sharkey [Sun, 15 Apr 2018 00:39:59 +0000 (17:39 -0700)]
Merge "Don't process broadcasts until really ready." into pi-dev
am:
fcc07b53fa
Change-Id: I898d5c2d351951a7c016cbc70cb81210a9e18b26
Salvador Martinez [Sun, 15 Apr 2018 00:34:03 +0000 (17:34 -0700)]
Merge "Add constant for bluetooth fragment" into pi-dev
am:
fd56770fb6
Change-Id: Ia22b7dd996d424b5ff1cb05b1d3f86df87124dd2
Brad Ebinger [Sun, 15 Apr 2018 00:29:07 +0000 (17:29 -0700)]
Merge "Update Docs to clarify using a Message across IPC" into pi-dev
am:
4558c77d5d
Change-Id: Ie1a0be63d26136f14cd30c354b889ec0311cc7ee
Brad Ebinger [Sun, 15 Apr 2018 00:25:44 +0000 (17:25 -0700)]
Merge "Adds a private field to parceled data." into pi-dev
am:
63a6bc6794
Change-Id: Ib87a7af0654cc1ec0db052d8ee72f4c74c0aea04
y [Sun, 15 Apr 2018 00:21:50 +0000 (17:21 -0700)]
[automerger skipped] [automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40 am:
927b3357fa am:
79d0fb2530 am:
a509e771ba am:
80e36faa72 am:
76d71fa910 am:
86cfcaa610 am:
4f5e234020 am:
5604680766 -s ours
am:
19c4ef269f -s ours
Change-Id: I852616ae9734355326c02a632ee9826510dc5d50
Chavi Weingarten [Sat, 14 Apr 2018 23:30:23 +0000 (16:30 -0700)]
Merge "Don't update crop WSA when drag resizing so screenshots are correct." into pi-dev
am:
5e09e0a34b
Change-Id: Iff03fb130bc2cf7e62ec8ce6580bbb3e80bf45cd
TreeHugger Robot [Sat, 14 Apr 2018 23:12:48 +0000 (23:12 +0000)]
Merge "Add new category key for ConnectDeviceFrag" into pi-dev
Philip P. Moltmann [Sat, 14 Apr 2018 22:48:31 +0000 (15:48 -0700)]
[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-mr1-dev
am:
4cfd9bb78d -s ours
Change-Id: I2b84b8b8cf53a5a1aef7e5a7169c3c6bd42e3ecc
Milo Sredkov [Thu, 12 Apr 2018 11:52:43 +0000 (12:52 +0100)]
Address visual inconsistency in smart replies
Address the major style differences and make the smart reply buttons
fit better with the other notification UI elements.
This CL does not yet address all the isues but removes the most
obvious inconsistencies.
Screenshot before: https://screenshot.googleplex.com/90QVvxJmUJ3.png
Screenshot after: https://screenshot.googleplex.com/2C8cMQgTVBG.png
Bug:
73605520
Test: In Notify post a Messaging notification with Large chices
Change-Id: Ide285c21c7bf83e9f06ade6912fd13cb3e4b9024
TreeHugger Robot [Sat, 14 Apr 2018 16:39:30 +0000 (16:39 +0000)]
Merge "Don't create recovery snapshot until it contains at least one key." into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 02:35:28 +0000 (02:35 +0000)]
Merge "Add an action to launch scanning settings" into pi-dev
Philip P. Moltmann [Sat, 14 Apr 2018 01:09:04 +0000 (01:09 +0000)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-mr1-dev
TreeHugger Robot [Sat, 14 Apr 2018 00:55:22 +0000 (00:55 +0000)]
Merge "(P) Revoke permision when group changed" into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 00:45:15 +0000 (00:45 +0000)]
Merge "Fix facetbuttons selection It didn't work when apps where in a virtual or secondary dispaly" into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 00:23:37 +0000 (00:23 +0000)]
Merge "Use heif embedded thumbnail if available" into pi-dev
Jeff Sharkey [Sat, 14 Apr 2018 00:11:30 +0000 (00:11 +0000)]
Merge "Benchmarks for streams." into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 00:11:15 +0000 (00:11 +0000)]
Merge "Return "null" cycles for deprecated callers." into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 00:07:51 +0000 (00:07 +0000)]
Merge "Only check bg restriction if an app is idle" into pi-dev
Jeff Sharkey [Fri, 13 Apr 2018 23:58:44 +0000 (23:58 +0000)]
Merge "OP_GET_USAGE_STATS should be noted, not checked." into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 23:51:24 +0000 (23:51 +0000)]
Merge "Add HFP/HearingAid set/get action device to greylist" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 23:43:26 +0000 (23:43 +0000)]
Merge "Correct lookback for while-idle alarm rate limiting" into pi-dev
Lifu Tang [Thu, 12 Apr 2018 17:13:15 +0000 (10:13 -0700)]
Add an action to launch scanning settings
Needs to launch scanning settings from other apps
Bug:
77823544
Test: build and flash
Change-Id: If02b359dcbfee79b34b6b66abb3cf36a2a3412e3
TreeHugger Robot [Fri, 13 Apr 2018 23:03:17 +0000 (23:03 +0000)]
Merge "Don't process broadcasts until really ready." into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 23:00:51 +0000 (23:00 +0000)]
Merge "Add constant for bluetooth fragment" into pi-dev
Makoto Onuki [Fri, 13 Apr 2018 22:53:57 +0000 (15:53 -0700)]
Fix "auto battery saver notification comes back"
Bug:
78017511
Test: Manual:
- Run them:
adb shell settings delete global low_power
adb shell settings delete global low_power_sticky
adb shell settings delete global low_power_trigger_level
adb shell settings delete secure low_power_manual_activation_count
adb shell settings delete secure low_power_warning_acknowledged
adb shell settings delete secure suppress_auto_battery_saver_suggestion
- Unplug
- Toggle BS 4 times -> the "Tap to schedule battery saver" notification shows up
- Dismiss the notification
- Wait until the battery percent drops
- Make sure the notification stays dismissed.
Change-Id: I82cbd0110ab5d140c9e9b5b449577040e51032c6
Fyodor Kupolov [Fri, 13 Apr 2018 19:12:51 +0000 (12:12 -0700)]
Only check bg restriction if an app is idle
Test: Manual
Bug:
77237719
Change-Id: I379b1f5f93ac4318929c080fd74fae23daebbe54
Christopher Tate [Fri, 13 Apr 2018 20:41:51 +0000 (13:41 -0700)]
Correct lookback for while-idle alarm rate limiting
Lookback for while-idle alarm "last delivered?" bookkeeping was clamping
at zero, but that means "when we rebooted" in the elapsed time base, not
a point in the deep past. As a result, testing sequences that forced
idle mode would behave unpredictably on devices that were rebooted
recently.
Change the lookback defaulting such that the first "while idle" alarm
that triggers after reboot will always be considered deliverable.
Change-Id: I0a35e046ecf858cd44523a6cece4a6a0779194bc
Fixes:
77981603
Test: atest CtsAlarmManagerTestCases
Test: POC app
Yohei Yukawa [Fri, 13 Apr 2018 21:55:30 +0000 (14:55 -0700)]
Respect light nav bar flag set by IME on keyguard
Currently LightBarController takes care of both ScrimBehind alpha and
ScrimInFront text color when finally deciding whether light navigation
bar mode should be enabled or not.
When IME is shown on the keyguard, however, light navigation bar flag
explicitly set by the IME actually needs to be used because
ScrimController does not put anything over the IME layer in that
state.
This CL addresses the above corner case, by also forwarding ScrimState
from ScrimController to LightBarController so that LightBarController
can change the behavior when scrim UI is in bouncer mode.
Test: atest CtsInputMethodTestCases
Test: atest com.android.server.policy.PhoneWindowManagerTest
Test: atest SystemUITests:com.android.systemui.statusbar.phone.ScrimControllerTest
Test: Manually tested Manually tested with ThemedNavBarKeyboard sample
1. make -j ThemedNavBarKeyboard
2. adb install -r $OUT/system/app/ThemedNavBarKeyboard/ThemedNavBarKeyboard.apk
3. adb shell ime enable com.example.android.themednavbarkeyboard/.ThemedNavBarKeyboard
4. adb shell ime set com.example.android.themednavbarkeyboard/.ThemedNavBarKeyboard
5. Open Dialer app
6. Focus in the top edit field.
7. Tap "EXTENDED LIGHT NAVIGARION BAR" mode
8. Make sure that the navigation button color is optimized for light navigation bar
9. Swipe down the notification shade.
10. Make sure that the navigation button color is inverted.
Fixes:
72940586
Change-Id: I7a9001888f9b2d74c84c384b6302706da7a2b4b2
Makoto Onuki [Fri, 13 Apr 2018 19:06:39 +0000 (12:06 -0700)]
Skip cross-user/profile check for start activity pending intents.
A pending intent, even from other users, should start whoever sends it on
whatever user.
Bug:
77601945
Test: Manual test with a work profile calendar widget with a 3p launcher app.
Change-Id: Ie9e08fa07c489f643e8a9d8ec97bc912f8cefbf7
Test: atest /android/pi-dev/cts/hostsidetests/shortcuts/hostside/src/android/content/pm/cts/shortcuthost/ShortcutManagerMultiuserTest.java
Brad Ebinger [Fri, 13 Apr 2018 21:35:13 +0000 (21:35 +0000)]
Merge "Update Docs to clarify using a Message across IPC" into pi-dev
Brad Ebinger [Fri, 13 Apr 2018 21:34:37 +0000 (21:34 +0000)]
Merge "Adds a private field to parceled data." into pi-dev
y [Fri, 13 Apr 2018 21:24:24 +0000 (14:24 -0700)]
[automerger skipped] [automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40 am:
927b3357fa am:
79d0fb2530 am:
a509e771ba am:
80e36faa72 am:
76d71fa910 am:
86cfcaa610 am:
4f5e234020
am:
5604680766 -s ours
Change-Id: I1ff6265b401704800f7be276034cb9cc720c94ec
Wale Ogunwale [Fri, 13 Apr 2018 21:23:52 +0000 (14:23 -0700)]
Merge changes from topic "bumping-api" into pi-dev
am:
51c1904b95
Change-Id: I4ffcb6a196296f4f81510bcd1cc6e8c65a0191dd
Wale Ogunwale [Fri, 13 Apr 2018 21:18:27 +0000 (14:18 -0700)]
Finalizing P SDK
am:
3da5f3b2dd
Change-Id: Id5002a3fc4d35352a4ace67e794c1a52e21c496c
Chavi Weingarten [Fri, 13 Apr 2018 21:14:16 +0000 (21:14 +0000)]
Merge "Don't update crop WSA when drag resizing so screenshots are correct." into pi-dev
y [Fri, 13 Apr 2018 21:08:07 +0000 (14:08 -0700)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40 am:
927b3357fa am:
79d0fb2530 am:
a509e771ba am:
80e36faa72 am:
76d71fa910 am:
86cfcaa610
am:
4f5e234020
Change-Id: Iedf59329ed35149cec2143e8f179c7912534a41d
Salvador Martinez [Wed, 4 Apr 2018 21:42:59 +0000 (14:42 -0700)]
Add constant for bluetooth fragment
simply adds a metrics constant for the new bluetooth screen
Bug:
77543471
Test: robotests pass
Merged-In: Id6317df4b86def4e0aa095fd3bc1ed544c0f0220
Change-Id: Id6317df4b86def4e0aa095fd3bc1ed544c0f0220
Yi Jin [Fri, 13 Apr 2018 21:00:16 +0000 (14:00 -0700)]
Merge "Reduce disk space limit for incident reports." into pi-dev
am:
a991071db9
Change-Id: I91a5bcc59ad1472832dfe0cf2e07216c8abf54f3
y [Fri, 13 Apr 2018 20:57:36 +0000 (13:57 -0700)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40 am:
927b3357fa am:
79d0fb2530 am:
a509e771ba am:
80e36faa72 am:
76d71fa910
am:
86cfcaa610
Change-Id: I6d37d24fd14271d24595c380ea553cb37948fa9e
Wale Ogunwale [Fri, 13 Apr 2018 20:53:03 +0000 (20:53 +0000)]
Merge changes from topic "bumping-api" into pi-dev
* changes:
Finalizing P SDK
Finalizing P SDK
Etan Cohen [Fri, 13 Apr 2018 20:52:35 +0000 (13:52 -0700)]
Merge "[RTT] Wi-Fi RTT Metrics" into pi-dev
am:
0e100add48
Change-Id: Ic03cd363914f4954d98525f32bb8054399338f91
Jeff Sharkey [Fri, 13 Apr 2018 20:38:01 +0000 (14:38 -0600)]
Return "null" cycles for deprecated callers.
Callers using the deprecated Pair<ZonedDateTime, ZonedDateTime>
interface don't always check hasNext() before calling next(), so
give them (null, null) results instead of throwing.
Bug:
78020489
Test: builds, boots
Change-Id: Ibaeac646fa4e12e3e748cd7c706524d51dbeaafe
Android Build Merger (Role) [Fri, 13 Apr 2018 20:35:02 +0000 (20:35 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40 am:
927b3357fa am:
79d0fb2530 am:
a509e771ba am:
80e36faa72 am:
76d71fa910
Change-Id: I971b589190cae708a08dd568290807dff0f75349
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:58 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40 am:
927b3357fa am:
79d0fb2530 am:
a509e771ba am:
80e36faa72
Change-Id: Ibeb5d99f477048e8715a0d4b093052f3d88445e2
OSDN Git Service
