OSDN Git Service
Ryan Mitchell [Mon, 16 Apr 2018 19:28:43 +0000 (19:28 +0000)]
Merge "Revert "AAPT: Modified StringPool uniqueness detection"" into pi-dev
Caxton Chan [Mon, 16 Apr 2018 19:24:31 +0000 (19:24 +0000)]
Merge "Enable feature flag for audio output switcher." into pi-dev
Philip P. Moltmann [Mon, 16 Apr 2018 18:55:42 +0000 (11:55 -0700)]
[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am:
cda08919cf am:
d139755de8
am:
5e2a5a8ce1 -s ours
Change-Id: I665c1f65a60926a70627db83da5c2c6f3e4f09c8
TreeHugger Robot [Mon, 16 Apr 2018 18:34:37 +0000 (18:34 +0000)]
Merge "Add new function to get audio state" into pi-dev
Ryan Mitchell [Mon, 16 Apr 2018 18:21:14 +0000 (18:21 +0000)]
Revert "AAPT: Modified StringPool uniqueness detection"
This reverts commit
35ecb89a8aa68f24d2e991df5bb9964ad15075dc.
Reason for revert: <Long make duration (infinite loop)>
Change-Id: I10d1cf53ca3054d40e23b06368ebaff6af69beab
Ricky Wai [Mon, 16 Apr 2018 18:19:00 +0000 (18:19 +0000)]
Merge "Update PackageManager.getInstalledPackages() docs" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 17:38:34 +0000 (17:38 +0000)]
Merge "Add logging to ScheduleConditionProvider" into pi-dev
Bryce Lee [Mon, 16 Apr 2018 17:36:45 +0000 (17:36 +0000)]
Merge "Remove temporary logging." into pi-dev
Ryan Mitchell [Mon, 16 Apr 2018 17:15:53 +0000 (17:15 +0000)]
Merge "AAPT: Modified StringPool uniqueness detection" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 17:05:45 +0000 (17:05 +0000)]
Merge "Unpin bitmaps but don't purge all scratch resources." into pi-dev
Isha Bobra [Thu, 5 Apr 2018 20:27:47 +0000 (13:27 -0700)]
The file CachedBluetoothDeviceManager.java performs synchronization
at class level. This CL just adds the missing synchronization bits.
Test: Manual
Change-Id: I71e0a194f8d126c2898a4086d6bcb62156cab9ad
Bug:
77849851
Jeff Sharkey [Mon, 16 Apr 2018 16:54:32 +0000 (16:54 +0000)]
Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 16:50:48 +0000 (16:50 +0000)]
Merge "Revert "ViewRoot: Ensure we release surface from setWindowStopped."" into pi-dev
Jeff Sharkey [Mon, 16 Apr 2018 16:50:34 +0000 (16:50 +0000)]
Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""
This reverts commit
bd2a9a2915c17cbe2100d6d2077568d0936cd719.
Reason for revert: ijpedowitz@
Bug:
77662908
Change-Id: I596d330d64942105f447bb613012bb11e281a805
Exempt-From-Owner-Approval: keep tests passing
Jeff Sharkey [Mon, 16 Apr 2018 16:50:06 +0000 (16:50 +0000)]
Merge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev
Isha Bobra [Mon, 16 Apr 2018 16:42:33 +0000 (16:42 +0000)]
Merge "Show only 1 entry for hearing aid device after killing the activity." into pi-dev
Jeff Sharkey [Mon, 16 Apr 2018 16:39:55 +0000 (16:39 +0000)]
Revert "OP_GET_USAGE_STATS should be noted, not checked."
This reverts commit
5a8bcd90315c24e2f16176fd13922b2a92752cd5.
Reason for revert: ijpedowitz@
Bug:
77662908
Change-Id: I5dd0ad5038df90ea8a80ba6f583ee46fb24600c2
Exempt-From-Owner-Approval: keep tests passing
TreeHugger Robot [Mon, 16 Apr 2018 16:18:34 +0000 (16:18 +0000)]
Merge "Convert the BrightnessController to a log scale control." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 16:08:18 +0000 (16:08 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
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
Beverly [Mon, 16 Apr 2018 15:42:40 +0000 (11:42 -0400)]
Add logging to ScheduleConditionProvider
Test: n/a
Bug:
77906756
Change-Id: Icfc0cbaf6d53315e437ac3ea3ab693b3e0703d2f
Chavi Weingarten [Mon, 16 Apr 2018 15:34:45 +0000 (15:34 +0000)]
Revert "ViewRoot: Ensure we release surface from setWindowStopped."
This reverts commit
35274cb0ce90ce4381e534d1c04c9d919eb588fc.
Reason for revert: b/
78110749
Fixes:
78110749
Change-Id: Ib1b15e4f7325cb265574090b658514fc0b3c4021
Makoto Onuki [Mon, 16 Apr 2018 15:32:20 +0000 (15:32 +0000)]
Merge "Fix "auto battery saver notification comes back"" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 15:20:04 +0000 (15:20 +0000)]
Merge "Cutout: Fix broken cutout rendering in landscape" into pi-dev
David Brazdil [Mon, 16 Apr 2018 15:04:07 +0000 (15:04 +0000)]
Merge "Add more hidden API on light greylist" into pi-dev
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
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.
Michael Wright [Fri, 13 Apr 2018 17:15:27 +0000 (18:15 +0100)]
Convert the BrightnessController to a log scale control.
Currently, the BrightnessController's UI is a linear scale control on
top of a linear backlight control, but humans perceive brightness on a
roughly logarithmic scale. By moving to a non-linear control, we both
give users more fine-grained control over the brightness of the display
as well as a UI that works more intuitively.
Test: manual
Bug:
73810208
Change-Id: I67090ad7c4ced0420314458473c9124cb9c61906
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
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
TreeHugger Robot [Mon, 16 Apr 2018 05:40:17 +0000 (05:40 +0000)]
Merge "Guard the SSID with NETWORK_SETTINGS" into pi-dev
Bill Yi [Mon, 16 Apr 2018 04:48:28 +0000 (21:48 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I06dbe1dfd8098c454295925a57df4e1ac7a41d7e
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
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
hughchen [Sat, 31 Mar 2018 09:32:53 +0000 (17:32 +0800)]
Add new function to get audio state
* Add getAudioState()
* Add isA2dpDevice() and isHfpDevice() in CachedBluetoothDevice
Bug:
74134939
Test: make RunSettingsLibRoboTests -j40
Change-Id: I18f4c1fcad0325a57de379f5ffe5b1135a00d084
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
Philip P. Moltmann [Sat, 14 Apr 2018 23:37:25 +0000 (16:37 -0700)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am:
cda08919cf
am:
d139755de8
Change-Id: I3607d28823ced42c14d39d99bbfd8ea346cfc835
Philip P. Moltmann [Sat, 14 Apr 2018 23:28:15 +0000 (16:28 -0700)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev
am:
cda08919cf
Change-Id: I949f16944d202078a1f191a1284f1c48a46cbb58
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:35:38 +0000 (00:35 +0000)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-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
y [Fri, 13 Apr 2018 18:25:12 +0000 (11:25 -0700)]
AAPT: Modified StringPool uniqueness detection
b/
77862560 detected that when converting an apk to binary using aapt2,
all resource ids of attributes that have been replaced with resource
identifiers become set to the identifier of the first attribute. This is
because the attribute names are all empty because the names are not necessary
since the resource ids are present. The empty attribute names all map to
the same string pool reference and cause all the ids to be the first
empty string into the string pool.
Bug:
77862560
Test: Converted apk in listed bug from proto to binary and observed
correct resource ids and correct badging.
Change-Id: I635c13cd1ad7a395fe40a57198cfe5ec91602d01
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
Isha Bobra [Fri, 9 Feb 2018 00:04:36 +0000 (16:04 -0800)]
Show only 1 entry for hearing aid device after killing the activity.
This CL detects Bluetooth hearing aid devices and tries to
combine the entry of the hearing aids with the same HiSyncIds and
shows only 1 entry for each pair in the connected devices list. This CL
works for scenarios just after pairing and reopening settings
activity after killing it.
This CL also has the logic to combine the entries just after pairing and
to forget both the devices on pressing forget for the combined entry.
Test: RunSettingsLibRoboTests
Bug:
74204427
Change-Id: Ib4c76eb0cae12937dd8403e37a0af8297a4aedc2
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
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
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
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
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:53 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40 am:
927b3357fa am:
79d0fb2530 am:
a509e771ba
Change-Id: I48bf9619571a30e6f5ea5bad503a3805e0821a75
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:49 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40 am:
927b3357fa am:
79d0fb2530
Change-Id: I068f51adbb0248db232c50bd89fb25ef0d7273a9
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:44 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40 am:
927b3357fa
Change-Id: I61c158947f3508aab9ef65988267562663c97a21
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:34 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40
Change-Id: I24a1df41eb29a6ac7e6c67368f07c6702dacf071
TreeHugger Robot [Fri, 13 Apr 2018 20:34:31 +0000 (20:34 +0000)]
Merge "Reduce disk space limit for incident reports." into pi-dev
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:29 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344
Change-Id: Ia175db4206119bed5e1a6b1aeeff72ae86489d38
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:24 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50
Change-Id: I0a5c57b7a50d9221b3be4d193388ac610ba92f73
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:20 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261
Change-Id: I57e2ea2122d22341c43b9b445291cc4b02ec2b11
y [Fri, 6 Apr 2018 00:57:27 +0000 (17:57 -0700)]
ResStringPool: Fix security vulnerability
Adds detection of attacker-modified size and data fields passed to
ResStringPool::setTo(). These attacks are modified apks that AAPT would
not normally generate. In the rare case this occurs, the installation
cannot be allowed to continue.
Bug:
71361168
Bug:
71360999
Test: run cts -m CtsAppSecurityHostTestCases \
-t android.appsecurity.cts.CorruptApkTests
Change-Id: If7eb93a9e723b16c8a0556fc4e20006aa0391d57
Merged-In: If7eb93a9e723b16c8a0556fc4e20006aa0391d57
Etan Cohen [Fri, 13 Apr 2018 20:29:22 +0000 (20:29 +0000)]
Merge "[RTT] Wi-Fi RTT Metrics" into pi-dev
Jeff Sharkey [Fri, 13 Apr 2018 20:28:30 +0000 (14:28 -0600)]
Don't process broadcasts until really ready.
Someone started setting mSystemReady too early, when we really want
to know SystemServer's real ready state. Add a variable to track
that, and don't process broadcasts until that's set.
Bug:
78020762
Test: builds, boots
Change-Id: I65213e46044c95fb0a8a4b09b9aa463bb15c1844
Philip P. Moltmann [Thu, 12 Apr 2018 21:45:14 +0000 (14:45 -0700)]
DO NOT MERGE (O) Revoke permision when group changed
If a run time permission of a group is already granted we grant the
other permission of the group automatically when requested.
Hence if an already granted permission changed its group during an
update suddenly permission of a potentially not approved group will
get auto-granted.
This is undesirable, hence we revoke the permission during the update
process.
Test: atest android.permission.cts.PermissionGroupChange
Change-Id: Ib2165d1ae53b80455ebe02e07775853e37a2e339
Fixes:
72710897
Philip P. Moltmann [Thu, 12 Apr 2018 21:45:14 +0000 (14:45 -0700)]
DO NOT MERGE (O) Revoke permision when group changed
If a run time permission of a group is already granted we grant the
other permission of the group automatically when requested.
Hence if an already granted permission changed its group during an
update suddenly permission of a potentially not approved group will
get auto-granted.
This is undesirable, hence we revoke the permission during the update
process.
Test: atest android.permission.cts.PermissionGroupChange
Change-Id: Ib2165d1ae53b80455ebe02e07775853e37a2e339
Fixes:
72710897
Jason Parks [Fri, 13 Apr 2018 19:56:20 +0000 (19:56 +0000)]
Merge "Allow Device Owners/Profile Owners to set the interruption filter." into pi-dev