OSDN Git Service
Zheng Zhang [Thu, 31 Aug 2017 17:47:16 +0000 (17:47 +0000)]
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider am:
03c0f16f37 -s ours am:
d877297ad4 -s ours am:
6f94a3740a -s ours
am:
2a540e9970 -s ours
Change-Id: Iea7e5e533da23bc64fcafe03d59297ae8d5d87da
Zheng Zhang [Thu, 31 Aug 2017 17:36:50 +0000 (17:36 +0000)]
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider am:
03c0f16f37 -s ours am:
d877297ad4 -s ours
am:
6f94a3740a -s ours
Change-Id: I12d33400af3e2f3c358839380ddee7fb8791e839
TreeHugger Robot [Thu, 31 Aug 2017 17:23:26 +0000 (17:23 +0000)]
Merge "Fix issue #
65055576: VoiceInteractionManagerService sets..." into oc-mr1-dev
Dianne Hackborn [Wed, 30 Aug 2017 23:21:28 +0000 (16:21 -0700)]
Fix issue #
65055576: VoiceInteractionManagerService sets...
...VOICE_RECOGNITION_SERVICE that is needed for SearchSpeechServices
System setup was incorrectly completely runing off
VoiceInteractionManagerService if the associated feature is not set,
but the service needs to always be running, and instead rely on
the existing logic of reducing functionality if it should not be
running full voice interaction services.
Test: manually booted and ran
Bug:
65055576
Change-Id: I9a83216d45689440c71d657ba2721faf0662b0ff
Daniel Nishi [Thu, 31 Aug 2017 17:20:14 +0000 (17:20 +0000)]
Merge "Update the work icon." into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 17:04:10 +0000 (17:04 +0000)]
Merge "Fix fingerprint error messages on Keyguard / AOD" into oc-mr1-dev
Jeff Sharkey [Thu, 31 Aug 2017 16:38:02 +0000 (16:38 +0000)]
Merge "Fix meteredness bugs in updateNetworkRulesNL()." into oc-mr1-dev
David Stevens [Thu, 31 Aug 2017 16:37:12 +0000 (16:37 +0000)]
Merge "Update DisplayContent tap exclude region on window resize" into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 16:36:57 +0000 (16:36 +0000)]
Merge "Add bt battery level to QS icons" into oc-mr1-dev
Jason Monk [Thu, 31 Aug 2017 16:35:37 +0000 (16:35 +0000)]
Merge "Reduce paddings on 320dp screens, we don't have much space" into oc-mr1-dev
Jason Monk [Thu, 31 Aug 2017 16:31:26 +0000 (16:31 +0000)]
Merge "Don't auto-expand QS from detail panels" into oc-mr1-dev
Jason Monk [Thu, 31 Aug 2017 16:31:10 +0000 (16:31 +0000)]
Merge "Fix carrier text rtl alignment" into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 15:38:57 +0000 (15:38 +0000)]
Merge "Fix multi user battery percentage" into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 15:33:54 +0000 (15:33 +0000)]
Merge "Unlock managed profile keystore when user is unlocked." into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 15:28:56 +0000 (15:28 +0000)]
Merge "Fix tuner DND UI" into oc-mr1-dev
Yohei Yukawa [Thu, 31 Aug 2017 15:26:07 +0000 (15:26 +0000)]
Merge "Fix wrong dump output of *Info#flags" into oc-mr1-dev
Yohei Yukawa [Thu, 31 Aug 2017 07:26:01 +0000 (00:26 -0700)]
Fix wrong dump output of *Info#flags
This CL follows up to a previous CL [1] that introduced an ability to
control filtering level of
- ActivityInfo#dump()
- ApplicationInfo#dump()
- ComponentInfo#dump()
- ProviderInfo#dump()
- ResolveInfo#dump()
- ServiceInfo#dump()
but also masked following outputs as an unexpected side effect.
- ActivityInfo#flags
- ApplicationInfo#flags
- ProviderInfo#flags
- ServiceInfo#flags
With this CL, above *Info#flags are correctly dumped again.
[1]: I0d01565babb87e68b840c9756a2ea730d699efc7
6ac42aeed905181b484f97a53db57a17134ef7a8
Test: Manually tested as follows.
1. make -j SoftKeyboard
2. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
3. adb shell dumpsys input_method
-> Check 'com.example.android.softkeyboard' section
-> make sure ServiceInfo#flags=0x0
-> make sure ApplicationInfo#flags=0x38a8be44
FLAG_HAS_CODE (1<<2)
FLAG_ALLOW_CLEAR_USER_DATA (1<<6)
FLAG_SUPPORTS_SMALL_SCREENS (1<<9)
FLAG_SUPPORTS_NORMAL_SCREENS (1<<10)
FLAG_SUPPORTS_LARGE_SCREENS (1<<11)
FLAG_RESIZEABLE_FOR_SCREENS (1<<12)
FLAG_SUPPORTS_SCREEN_DENSITIES (1<<13)
FLAG_ALLOW_BACKUP (1<<15)
FLAG_SUPPORTS_XLARGE_SCREENS (1<<19)
FLAG_STOPPED (1<<21)
FLAG_SUPPORTS_RTL (1<<22)
FLAG_INSTALLED (1<<23)
FLAG_FULL_BACKUP_ONLY (1<<26)
FLAG_EXTRACT_NATIVE_LIBS (1<<28)
FLAG_HARDWARE_ACCELERATED (1<<29)
Fixes:
65057767
Change-Id: Icd1e18237e873844791ccdea7f424b6fe76137c0
Tyler Gunn [Thu, 31 Aug 2017 15:13:08 +0000 (15:13 +0000)]
Merge "De-couple data enabled from VT settings." into oc-mr1-dev
Bryce Lee [Thu, 31 Aug 2017 14:43:02 +0000 (14:43 +0000)]
Merge "Clear pending activity options when retrieved in ActivityManagerService." into oc-mr1-dev
Kevin Chyn [Thu, 31 Aug 2017 12:59:00 +0000 (12:59 +0000)]
Update UnlockMethodCache when screen turns off
am:
08ae664365
Change-Id: I132358dc66f04cb2531e6d57ed8d2dd14947b62d
Pavel Grafov [Wed, 23 Aug 2017 11:20:54 +0000 (12:20 +0100)]
Unlock managed profile keystore when user is unlocked.
With file based encryption when the user unlock the phone,
managed profile is already running (in a locked state). But
on full disk encryption devices, LSS attempts to unlock child
profile straight after unlocking user 0, which fails because
the profile is not yet running.
With this change once the profile gets unlocked (happens after
ActivityManagerService processes START_PROFILES_MSG message)
LSS will attempt to unlock its keystore.
Bug:
64722589
Test: manual, tried FDE and FBE devices with unified challenge.
Change-Id: Ic614cc3c6732a3db6aaf56fef1822e358d742510
TreeHugger Robot [Thu, 31 Aug 2017 04:34:43 +0000 (04:34 +0000)]
Merge "Skip handling recents toggle if a task is locked." into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 03:52:51 +0000 (03:52 +0000)]
Merge "Use isolated uid to set oom_score_adj" into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 03:12:24 +0000 (03:12 +0000)]
Merge "Update icons to have rounded corner" into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 02:50:04 +0000 (02:50 +0000)]
Merge "At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread" into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 02:28:11 +0000 (02:28 +0000)]
Merge "WebView: fix setSafeBrowsingWhitelist table in docs" into oc-mr1-dev
Kevin Chyn [Thu, 31 Aug 2017 02:02:43 +0000 (19:02 -0700)]
Update UnlockMethodCache when screen turns off
Fixes:
65212307
Test: 1) add a temporary log in update()
2) turn off screen, make sure update() is called, and
canSkipBouncer value is updated and correct
Change-Id: I576d2375d38e83f286ad1fc6aa25944326c3ef8f
TreeHugger Robot [Thu, 31 Aug 2017 01:23:03 +0000 (01:23 +0000)]
Merge "Adjusting PiP for the TV IME." into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 01:03:26 +0000 (01:03 +0000)]
Merge "Fix up bar transitions on low end devices" into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 00:34:57 +0000 (00:34 +0000)]
Merge "Fixes NPE thrown in sort if new targets are added." into oc-mr1-dev
Wonsik Kim [Wed, 30 Aug 2017 23:28:01 +0000 (16:28 -0700)]
At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread
Fixes:
65210445
Fixes:
64915666
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Change-Id: I73f1cebdd4b990e28f8d466f129e781cba2b5bbf
David Stevens [Fri, 17 Mar 2017 02:00:20 +0000 (19:00 -0700)]
Update DisplayContent tap exclude region on window resize
Bug:
64841677
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testLaunchExternalDisplayActivityWhilePrimaryOff
Merged-In: I9c512cef707975f2fcb8a6febc4b89b47fda2dcc
Change-Id: I9c512cef707975f2fcb8a6febc4b89b47fda2dcc
Fan Zhang [Wed, 30 Aug 2017 23:41:20 +0000 (16:41 -0700)]
Update icons to have rounded corner
Bug:
65204006
Test: visual
Change-Id: I97baac238495b5a03e91edb18e0a3482f67edf71
Zhen Sun [Wed, 30 Aug 2017 23:37:44 +0000 (23:37 +0000)]
Merge "ATV a11y shortcut (CL 1 of 3): Update key chord" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 23:35:07 +0000 (23:35 +0000)]
Merge "Add static lock in PowerProfile" into oc-mr1-dev
Jason Monk [Wed, 30 Aug 2017 23:18:00 +0000 (19:18 -0400)]
Fix multi user battery percentage
Test: Use battery percentage with multi user, like at all
Change-Id: Ie59d2409e79469138c04450528ed3e9f4e1c06aa
Fixes:
64442190
Jeff Sharkey [Wed, 30 Aug 2017 22:28:26 +0000 (16:28 -0600)]
Fix meteredness bugs in updateNetworkRulesNL().
The logic in that method appears to have become broken at some
point; refactor it to apply all known network policies, and then
perform one last pass to handle any metered networks that didn't
have policies; typically Wi-Fi networks.
Test: cts-tradefed run commandAndExit cts-dev -m CtsHostsideNetworkTests
Bug:
64274313
Change-Id: Id9cbcc6fdfe3793e058f52505c9edd250bed7089
Phil Weaver [Wed, 30 Aug 2017 23:10:03 +0000 (23:10 +0000)]
Merge "resolve merge conflicts of
490d397d284f to oc-dr1-dev" into oc-dr1-dev
am:
0ddaa63b67 -s ours
Change-Id: Id403b03e837eafab80ed20271543e82cb74c260b
Jason Monk [Wed, 30 Aug 2017 23:09:01 +0000 (19:09 -0400)]
Fix tuner DND UI
Test: visual
Change-Id: Ia90209b487aeee4ee162c54aa6cf923551f50d31
Fixes:
62588404
TreeHugger Robot [Wed, 30 Aug 2017 23:05:12 +0000 (23:05 +0000)]
Merge "Add heif format to ExifInterface" into oc-mr1-dev
Phil Weaver [Wed, 30 Aug 2017 22:54:59 +0000 (22:54 +0000)]
Merge "resolve merge conflicts of
490d397d284f to oc-dr1-dev" into oc-dr1-dev
Jason Monk [Wed, 30 Aug 2017 22:47:09 +0000 (18:47 -0400)]
Don't auto-expand QS from detail panels
We don't have tiles that launch detail panels from collapsed state
anymore, and its getting in the way of animateExpandSettingsPanel.
Test: visual
Change-Id: I9e8049f775a7ed7a9fe1aac035a7527a997707bc
Fixes:
62912307
Jason Monk [Wed, 30 Aug 2017 22:44:35 +0000 (22:44 +0000)]
Merge "Don't touch auto dim on app change" into oc-mr1-dev
Christine Franks [Wed, 30 Aug 2017 22:33:01 +0000 (22:33 +0000)]
Merge "Update night display intensity coefficients" into oc-mr1-dev
Jason Monk [Wed, 30 Aug 2017 22:27:50 +0000 (18:27 -0400)]
Fix carrier text rtl alignment
Test: visual
Change-Id: I91f76bdbe23cfd2ee0df023a970f73428bd513e9
Fixes:
62622048
TreeHugger Robot [Wed, 30 Aug 2017 22:13:58 +0000 (22:13 +0000)]
Merge "Introduce SmartSelectionEventTracker." into oc-mr1-dev
Paul Mclean [Wed, 30 Aug 2017 22:13:36 +0000 (22:13 +0000)]
Merge "Adding USB audio-class 2.0 spec descriptors." into oc-mr1-dev
Jason Monk [Wed, 30 Aug 2017 22:11:21 +0000 (18:11 -0400)]
Add bt battery level to QS icons
Test: visual
Change-Id: I690e496e3e88fd734d43ea2f25396772e922940c
Fixes:
63393322
TreeHugger Robot [Wed, 30 Aug 2017 22:11:52 +0000 (22:11 +0000)]
Merge "BatteryStats: Don't schedule work when shutting down" into oc-mr1-dev
Jason Monk [Wed, 30 Aug 2017 21:35:27 +0000 (17:35 -0400)]
Reduce paddings on 320dp screens, we don't have much space
Test: visual
Change-Id: I9241456e8c9d871a3c510f21226eb248ad8da13a
Fixes:
64383795
Kang Li [Wed, 30 Aug 2017 21:18:11 +0000 (14:18 -0700)]
Fixes NPE thrown in sort if new targets are added.
Test: manually tested it to verify that it works as expected.
Bug:
65035399
Change-Id: Ie99b05c5324f47cbac66687d7301ef62a7c83e55
Jason Monk [Wed, 30 Aug 2017 21:05:24 +0000 (17:05 -0400)]
Fix up bar transitions on low end devices
- Don't allow dark icons, because the backdrop is always dark.
- Don't show the view when we aren't showing notification icons or
system info, because the view may need to be transparent.
Test: manual
Change-Id: I5572a6379ceb605b21a1982db00fdf1659593b8a
Fixes:
62549040
Nate Fischer [Tue, 29 Aug 2017 23:17:22 +0000 (16:17 -0700)]
WebView: fix setSafeBrowsingWhitelist table in docs
No change to logic, only docs changes.
The documentation for setSafeBrowsingWhitelist uses a table to describe
whitelist rules. However, this table was previously formatted
incorrectly (it uses <th> elements for each cell, when normal data cells
should use <td> according to Android API guidelines).
This fixes the table to conform to the guidelines, adjusts white space
for consistency, and removes an unnecessary <p> element.
Bug:
65173825
Test: make docs (and manually verify the table looks correct)
Change-Id: I5d7390a44613aaa3acb147a69f8e0ce741e817ed
TreeHugger Robot [Wed, 30 Aug 2017 20:52:19 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Hall Liu [Wed, 30 Aug 2017 20:41:53 +0000 (20:41 +0000)]
Merge "Make slight API and doc adjustments" into oc-mr1-dev
Zhen Sun [Thu, 17 Aug 2017 22:56:20 +0000 (15:56 -0700)]
ATV a11y shortcut (CL 1 of 3): Update key chord
Changed accessibility shortcut key chord from [HOME + DPAD_CENTER] to
[BACK + DPAD_DOWN]. (Followed logic in ag/
1939791.)
Specified AudioAttributes of TV dialog ringtone to
USAGE_ASSISTANCE_ACCESSIBILITY since this dialog is meant to show up for
accessibility shortcut feature and that will also enable Android TVs to
play ringtone for the warning dialog.
Bug:
64346294
Test: Manually use key chord to trigger accessibility shortcut.
Change-Id: Iacb29400079551a3c3ded6f8391b7541bc1c9f29
TreeHugger Robot [Wed, 30 Aug 2017 20:35:52 +0000 (20:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:31:03 +0000 (20:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:29:57 +0000 (20:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:28:10 +0000 (20:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:24:40 +0000 (20:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:23:09 +0000 (20:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
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
TreeHugger Robot [Wed, 30 Aug 2017 20:11:03 +0000 (20:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:04:56 +0000 (20:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 19:34:24 +0000 (19:34 +0000)]
Merge "Adding back recents grow in split screen" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 19:32:58 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Christine Franks [Thu, 27 Jul 2017 00:51:16 +0000 (17:51 -0700)]
Update night display intensity coefficients
Bug:
64019890
Test: manual - adjust intensity slider
Change-Id: I38ec7385b36367e5c9f6c606e65a982efbd32a1b
Jeff Sharkey [Wed, 30 Aug 2017 19:01:18 +0000 (19:01 +0000)]
Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev
Chris Tate [Wed, 30 Aug 2017 18:44:03 +0000 (18:44 +0000)]
Merge "Setting a wallpaper must be synchronous" into oc-mr1-dev
Chong Zhang [Fri, 25 Aug 2017 23:20:01 +0000 (16:20 -0700)]
Add heif format to ExifInterface
Get heif dimension and rotation from MediaMetadataRetriever.
Bug:
64077740
Change-Id: I711ac70d356dbfd9128a30ab33c0dfd81a4ae17e
Brad Ebinger [Wed, 30 Aug 2017 18:31:43 +0000 (18:31 +0000)]
Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev
Kevin Chyn [Fri, 25 Aug 2017 21:23:36 +0000 (14:23 -0700)]
Fix fingerprint error messages on Keyguard / AOD
1) "Too many attempts" message should be shown when AOD -> Keyguard
2) onFingerprintError() errors should not be cleared by previous
onFingerprintHelp() messages (MSG_CLEAR_FP_MSG), otherwise the error
won't be displayed for the full 5000ms
3) "Too many attempts" message should be shown when user is locked out
on AOD
4) FINGERPRINT_ERROR_LOCKOUT_PERMANENT error should show whenever
AOD or keyguard is entered (same as regular lockout message behavior)
Fixes:
65055500
Test: Manual test of above situations
Change-Id: I8793f61ea80a3aa920838790ae2af68fc29c1981
TreeHugger Robot [Wed, 30 Aug 2017 17:47:46 +0000 (17:47 +0000)]
Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev
Adam Lesinski [Wed, 30 Aug 2017 02:30:31 +0000 (19:30 -0700)]
BatteryStats: Don't schedule work when shutting down
Prevent more work from being queued when BatteryStats is
shutting down.
Bug:
64901294
Test: manual
Change-Id: Ifc74a4405b40c949e440d6d65fdd13ec40920429
Paul McLean [Fri, 7 Jul 2017 14:14:52 +0000 (08:14 -0600)]
Adding USB audio-class 2.0 spec descriptors.
Added USB audio-class 2.0 format type descriptors.
Added Tree parsing.
Rearchitected reporting (again) to better support reuse and scale.
Bug:
64301464
Test: Run code against representative USB audio peripherals and verify
that each correctly handles or ignores all descriptors and the correct
device semantics (headset / not-headset) are still calculated.
Change-Id: I1b3b01ab1cd804ed876bf6427c3afba15eea6a6e
Jeff Sharkey [Tue, 29 Aug 2017 21:32:13 +0000 (15:32 -0600)]
Augment network stats based on SubscriptionPlan.
When a carrier provides an "anchor" of data usage at a specific
moment in time, augment the network statistics used by warning/limit
thresholds and Settings UI. For example, if the OS measured 500MB
of usage, but the carrier says only 400MB has been used, we "squish"
down the OS measured usage to match that anchor.
Callers using the hidden API will have their data augmented by
default, and the public API offers a way to opt-into augmentation.
Thorough testing to verify behavior.
Test: bit FrameworksNetTests:android.net.,com.android.server.net.
Test: cts-tradefed run commandAndExit cts-dev -m CtsUsageStatsTestCases -t android.app.usage.cts.NetworkUsageStatsTest
Bug:
64534190
Change-Id: Id3d4d7625bbf04f57643e51dbf376e3fa0ea8eca
Bryce Lee [Tue, 29 Aug 2017 23:37:34 +0000 (16:37 -0700)]
Clear pending activity options when retrieved in ActivityManagerService.
This behavior was removed in ag/
2648555
Change-Id: Ib04e8f1ddf1057a7bf2cbd4c422956fc6129a501
Fixes:
65070883
Test: manual via the bug repro steps.
Todd Kennedy [Wed, 30 Aug 2017 13:48:28 +0000 (13:48 +0000)]
Merge "Set CPU Abis for updated system packages" into oc-mr1-dev
Abodunrinwa Toki [Tue, 15 Aug 2017 14:05:11 +0000 (15:05 +0100)]
Introduce SmartSelectionEventTracker.
This will be used for logging text selection interaction.
Bug:
64914512
Test: No test. Everything builds fine.
Change-Id: Idb28864e0fc969be05d81855b2e7cd8389bd835e
Bill Yi [Wed, 30 Aug 2017 04:00:33 +0000 (21:00 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ied35c473af7c2834bc145269270d41c1fbb7563e
TreeHugger Robot [Wed, 30 Aug 2017 03:54:06 +0000 (03:54 +0000)]
Merge "Update comment for ASSIST_GESTURE_TRIGGERED" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 03:53:42 +0000 (20:53 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I1dbe08a427134a196041d6b68a220fc2a6a991d8
Bill Yi [Wed, 30 Aug 2017 02:42:12 +0000 (19:42 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Id452855fd3f6af7d1daaa2aede1baa65a78c557f
Bill Yi [Wed, 30 Aug 2017 02:35:20 +0000 (19:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I67b019a8fa6529ad6540e9c2cc784a413b411fe3
Bill Yi [Wed, 30 Aug 2017 02:29:09 +0000 (19:29 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I16a811e84d3642459e686c84dcc5cecbbf5ada9b
Tim Murray [Wed, 30 Aug 2017 02:13:38 +0000 (02:13 +0000)]
Merge "Revert "Fix transition between two occluding activities"" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 02:10:49 +0000 (19:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I48522f7eba9fae610d5551a3dcdf6292a4a0abb8
Bill Yi [Wed, 30 Aug 2017 02:04:00 +0000 (19:04 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic27c4ce111ea2a017cec2e66812e922991152666
Bill Yi [Wed, 30 Aug 2017 01:57:44 +0000 (18:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I4eebbdb73bfd8558666b22135de33f7183ee8ee0
Bill Yi [Wed, 30 Aug 2017 01:51:00 +0000 (18:51 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I77ff98cb6d61c557fb070c8ba9939bc7dd5637cd
Bill Yi [Wed, 30 Aug 2017 01:43:54 +0000 (18:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I6792eb7fe4f28b87cd53504b0c8318a751f33c27
Jason Monk [Wed, 30 Aug 2017 01:24:04 +0000 (01:24 +0000)]
Merge "Auto dim the nav bar to help prevent diff aging" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 00:57:23 +0000 (00:57 +0000)]
Merge "Screen-pinning unpin security fails for secondary user. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 00:53:33 +0000 (00:53 +0000)]
Merge "Added system_server to system group" into oc-mr1-dev
Fyodor Kupolov [Wed, 30 Aug 2017 00:19:29 +0000 (00:19 +0000)]
Merge "Make shutdown logging thread-safe" into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 23:56:50 +0000 (23:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Christopher Tate [Tue, 29 Aug 2017 23:50:13 +0000 (16:50 -0700)]
Setting a wallpaper must be synchronous
Observable state needs to be fully established by the time the
caller is allowed to proceed, otherwise they might read stale
information. In particular, we hadn't yet committed changes to
the backing store by the time observers were released, so they
could then read a stale generation number as the "current" state.
With this fix, the flaky CTS test is now reliably passing.
Test: cts-tradefed run cts-dev -m CtsAppTestCases -t android.app.cts.WallpaperManagerTest\#setBitmapTest
Bug:
65016846
Change-Id: I93fc690caedfbcd455a91625a3c67fff9168483b
TreeHugger Robot [Tue, 29 Aug 2017 23:47:50 +0000 (23:47 +0000)]
Merge "Note cross-user permission requirement for relevant wallpaper operations" into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 23:41:47 +0000 (23:41 +0000)]
Merge "Prevent getting large bitmap log error for gobo" into oc-mr1-dev