OSDN Git Service
Android Build Merger (Role) [Sat, 16 Jun 2018 05:50:04 +0000 (05:50 +0000)]
Merge "Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev am:
a74fbef8ce" into pi-dev-plus-aosp
Kevin Chyn [Sat, 16 Jun 2018 05:49:30 +0000 (22:49 -0700)]
Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev
am:
a74fbef8ce
Change-Id: Ib14cc5a35991dec3623ecf2dfdb72cbbccd7e53e
Colin Cross [Sat, 16 Jun 2018 05:46:10 +0000 (22:46 -0700)]
Merge "Fix ManifestMerger issues" am:
684b5f038b
am:
c5e5b64b04
Change-Id: I4b8e51aaec1f825e4ccf7ccbc60e61b82e05c509
TreeHugger Robot [Sat, 16 Jun 2018 00:28:17 +0000 (00:28 +0000)]
Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev
Colin Cross [Fri, 15 Jun 2018 23:59:21 +0000 (16:59 -0700)]
Merge "Fix ManifestMerger issues"
am:
684b5f038b
Change-Id: I4a551483dd3f0093f11b557a8ee6e6a99cace256
Selim Cinek [Fri, 15 Jun 2018 21:53:49 +0000 (14:53 -0700)]
Merge "Hiding replied notification icons from AOD" into pi-dev
am:
37e96a8fa5
Change-Id: I60a5aa171261b97b4f6de41515332fa93016eb8d
Adrian Roos [Fri, 15 Jun 2018 21:48:23 +0000 (14:48 -0700)]
Merge changes I90451c14,I9fb27a0a into pi-dev
am:
b91dd1d944
Change-Id: I58459846d6cb79d616b4bd9c83450dc911e5115c
Treehugger Robot [Fri, 15 Jun 2018 20:47:30 +0000 (20:47 +0000)]
Merge "Fix ManifestMerger issues"
Selim Cinek [Fri, 15 Jun 2018 20:44:08 +0000 (20:44 +0000)]
Merge "Hiding replied notification icons from AOD" into pi-dev
Adrian Roos [Fri, 15 Jun 2018 20:28:13 +0000 (20:28 +0000)]
Merge changes I90451c14,I9fb27a0a into pi-dev
* changes:
DO NOT MERGE WM: correctly draw the rounded corner / cutout overlay during rotation
WM: Fix seamless rotation
Eric Laurent [Fri, 15 Jun 2018 17:59:08 +0000 (10:59 -0700)]
Merge "audioservice: fix a2dp connection race condition" into pi-dev
am:
706303541e
Change-Id: I7ce96cb90aad6c826bbeb7be0e80950f2a89b517
Philip P. Moltmann [Fri, 15 Jun 2018 17:48:34 +0000 (10:48 -0700)]
Merge "Abbreviate permission labels less aggressively" into pi-dev
am:
af76df93e3
Change-Id: I61a45dd4489c930f2c5b3fbcf6f7632771d6f18e
Eric Laurent [Fri, 15 Jun 2018 17:43:42 +0000 (17:43 +0000)]
Merge "audioservice: fix a2dp connection race condition" into pi-dev
Philip P. Moltmann [Fri, 15 Jun 2018 17:18:52 +0000 (17:18 +0000)]
Merge "Abbreviate permission labels less aggressively" into pi-dev
Sundong Ahn [Fri, 15 Jun 2018 05:12:45 +0000 (22:12 -0700)]
Merge "Build com.android.location.provider with java_sdk_library" am:
aa5d8dfeb0
am:
abdaa314f8
Change-Id: If55a20564704769fc750fb6675533e9a0b8f3b6a
Bernie Innocenti [Fri, 15 Jun 2018 05:02:58 +0000 (22:02 -0700)]
Merge "Make dumpHexString() tolerate null arrays." am:
a917c1db32
am:
7bb253d078
Change-Id: Id58b8039510baa518d8d10b03237681a7b842d0f
Sundong Ahn [Fri, 15 Jun 2018 04:59:40 +0000 (21:59 -0700)]
Merge "Build com.android.location.provider with java_sdk_library"
am:
aa5d8dfeb0
Change-Id: I53720ed4fcbe9f00f2f1f607d07efa9adaaf7bb4
Bernie Innocenti [Fri, 15 Jun 2018 04:55:53 +0000 (21:55 -0700)]
Merge "Make dumpHexString() tolerate null arrays."
am:
a917c1db32
Change-Id: Ib0160e232cab0a713853a65eef26f7a02d65c1f1
Treehugger Robot [Fri, 15 Jun 2018 03:41:18 +0000 (03:41 +0000)]
Merge "Build com.android.location.provider with java_sdk_library"
Tony Huang [Fri, 15 Jun 2018 03:13:32 +0000 (20:13 -0700)]
Fix solid circle show on message notification
am:
1250cd1407
Change-Id: I9742ab1f93c797e23d4545d6659efcfa4808b03c
Tony Huang [Wed, 6 Jun 2018 07:40:47 +0000 (15:40 +0800)]
Fix solid circle show on message notification
Message app or other apps will use some format code or controll
code on SenderName to fit RTL or other design, and symbols will
produced by these code. The special code pattern not include these
code, so it will go charIcon flow.
Although these code is not visible, we should just ignore them to
get symbol strings
Change-Id: I20ef459b10ba7504ec0c997ed815cb485817d2bc
Fixes:
109746235
Test: Check notification form message app on RTL
Test: atest SystemUITests
Treehugger Robot [Fri, 15 Jun 2018 02:32:54 +0000 (02:32 +0000)]
Merge "Make dumpHexString() tolerate null arrays."
Adrian Roos [Thu, 31 May 2018 16:07:28 +0000 (18:07 +0200)]
DO NOT MERGE WM: correctly draw the rounded corner / cutout overlay during rotation
When we freeze the screen, we really don't want the overlay to appear
on the screenshot - otherwise this will lead to it rotating with the
screen content. This means the overlay currently disappears during the
transition. We cannot just draw it over the screenshot, because it
might be in inconsistent state.
We fix this by temporarily undoing the effects of the screen rotation
transform on the overlay's window token. Then, once the window has
performed relayout and is redrawn in the new orientation, we switch to
that representation. This is mostly seamless rotation, with the
difference that we force it always, and it must also work for 180
degree rotation (which regular seamless rotation does not).
Do not merge, because we want to harmonize seamless rotation and the
newly added forced seamless rotation in Q.
Also move the rounded corner overlay from the display overlay layer
to the root of the hierarchy such that it can draw over the screen
off animation's ColorLayer.
Bug:
79112140
Test: Enable display cutout overlay, rotate phone to all orientations, ensure that emulated display cutout never flashes or disappears.
Test: atest CoordinateTransformsTest
Change-Id: I90451c14dc28daa3f90a74c3117548fead25af3f
Adrian Roos [Thu, 7 Jun 2018 13:29:34 +0000 (15:29 +0200)]
WM: Fix seamless rotation
With the introduction of the surface hierarchy, the seamless rotation
behavior in WSA is no longer correct: it also applies the WindowState's
offset, which leads to that being applied twice.
Instead of doing that, we simply rotate the WSA surface within the place
that WindowState dictates now.
Finally, the location of the WindowState itself also needs to be
transformed into the new orientation.
Fixes:
109927566
Test: atest CoordinateTransformsTest
Test: atest 'WindowStateTests#testSeamlesslyRotateWindow'
Change-Id: I9fb27a0a8a2bddc6ec88a4fcce6d6ea00929fb91
Eric Laurent [Thu, 14 Jun 2018 02:36:42 +0000 (19:36 -0700)]
audioservice: fix a2dp connection race condition
In case of fast (< 1 second) A2DP disconnect/connect sequence, there
is a potential race condition where the delayed disconnection message
(due to becoming noisy intent) is received after the not delayed
connection message.
- Make sure all messages related to device connection/disconnection
(including MSG_A2DP_DEVICE_CONFIG_CHANGE and MSG_BTA2DP_DOCK_TIMEOUT)
are handled by queueMsgUnderWakeLock().
- Make sure messages are processed in the same order as API calls.
- Add check for null address in makeA2dpDeviceUnavailableNow().
Bug:
109903807
Bug:
78837311
Test: repro steps in bugs. A2DP connection and playback
Change-Id: Ib81b3805f945f7206b1a60de74e9bbeeef89bdd0
Tracy Zhou [Thu, 14 Jun 2018 23:50:53 +0000 (16:50 -0700)]
Merge "Revert "Change quickstep onboarding tip window type to"" into pi-dev
am:
b2b255a131
Change-Id: I585b9c7df35114b47ea0ab9af7ee0b881b195e4e
Tracy Zhou [Thu, 14 Jun 2018 23:28:34 +0000 (23:28 +0000)]
Merge "Revert "Change quickstep onboarding tip window type to"" into pi-dev
Colin Cross [Thu, 14 Jun 2018 22:23:21 +0000 (15:23 -0700)]
Fix ManifestMerger issues
Set LOCAL_MIN_SDK_VERSION in SettingsLib so that the build system
doesn't raise the minSdkVersion value specified in the manifest,
which causes ManifestMerger to error when trying to merge it into
a package that specifies a lower minSdkVersion.
Bug:
78447299
Test: m java
Change-Id: Ie2c2458647cd6495418999b35894dc92343992cc
Wale Ogunwale [Thu, 14 Jun 2018 22:18:36 +0000 (15:18 -0700)]
Make testSplitscreenPortraitAppOrientationRequests pass to unblock release
am:
cf2d6475f9
Change-Id: I93ac74e692e5d0f7f78d2c431b9e4fd4300aec09
Neil Fuller [Thu, 14 Jun 2018 21:31:23 +0000 (14:31 -0700)]
Merge "Clear calling identity before doing any work" am:
31686e954a
am:
3eb2ad1096
Change-Id: I3a940e1fb84bc04b7b53cbe25111768deb3e6d0c
Neil Fuller [Thu, 14 Jun 2018 21:15:04 +0000 (14:15 -0700)]
Merge "Clear calling identity before doing any work"
am:
31686e954a
Change-Id: I144fd2b5f46ce7d7a06195a2dd5207d44cd951f0
Treehugger Robot [Thu, 14 Jun 2018 19:13:29 +0000 (19:13 +0000)]
Merge "Clear calling identity before doing any work"
Philip P. Moltmann [Thu, 14 Jun 2018 18:52:14 +0000 (11:52 -0700)]
Abbreviate permission labels less aggressively
We switched the package installer app to always abbreviate all labels
loaded from foreign packages. This is done so that a foreign app cannot
crorrupt the UI via super-long strings.
The default abbreviation is very aggressive and abbreviates to ~5 cm.
When an app with a targetSDK <= M gets installed, all permissions will
get auto-granted. Hence when a user side-loads such an app, we show the
permissions during install so that the user is aware of this.
Unfortunately most permission labels and restrictions do not fit into a
single line.
This change allows much longer strings for permissions names and
descriptions. It still abbreviates eventually and handles permission
descriptions with weird characters (such as back-space) correctly.
Fixes:
110209410
Test: Side-loaded old app and verified that permission labels and
descriptions are not abbreviated.
Change-Id: Ie1db240883c9f5cb9c1b74ca7bdcb80625e3f7f2
Neil Fuller [Wed, 13 Jun 2018 15:56:38 +0000 (16:56 +0100)]
Clear calling identity before doing any work
This makes sure that the system server is credited/blamed
for the logic being executed.
Test: (internal) atest FrameworksServicesTests:com.android.server.timedetector
Bug:
78217059
Change-Id: Ie2586cf0d983e9aef9371d6db285c8420e9c8dc0
Wale Ogunwale [Thu, 14 Jun 2018 15:55:42 +0000 (08:55 -0700)]
Make testSplitscreenPortraitAppOrientationRequests pass to unblock release
Work around to unblock the release for failing test
ActivityManagerAppConfigurationTests#testSplitscreenPortraitAppOrientationRequests
which shouldn't be failing since home stack shouldn't be visible. We need
to dig deeper to see why it is failing.
NOTE: Not failing on current master...
Bug:
110159357
Test: atest ActivityManagerAppConfigurationTests#testSplitscreenPortraitAppOrientationRequests
Change-Id: I69423eef3661133b2a032a166745157b3e344751
Bernie Innocenti [Thu, 14 Jun 2018 08:55:58 +0000 (17:55 +0900)]
Make dumpHexString() tolerate null arrays.
Rationale: hexdumps are mainly used when verbose logging is enabled,
which means that callers are rarely exercised (let alone tested).
Crashing on unchecked null pointers doesn't make debugging any easier,
nor production code any more robust.
Moreover, this is the behavior of system.out.println() and other
logging APIs.
Test: runtest -x core/tests/coretests/src/com/android/internal/util/HexDumpTest.java
Bug:
110177912
Change-Id: Idccd81a5654ed0f7fee6b27177941bf8c311973e
Neil Fuller [Thu, 14 Jun 2018 09:49:13 +0000 (02:49 -0700)]
Merge "Add TimestampedValue.toString()" am:
bfa58946f7
am:
494665870f
Change-Id: Iedd2ce7207cb8c74e9a109e8cdb6c687f45072ec
Neil Fuller [Thu, 14 Jun 2018 09:40:17 +0000 (02:40 -0700)]
Merge "Add TimestampedValue.toString()"
am:
bfa58946f7
Change-Id: I38760ef47ba04f20882a467857e7c57c088d4391
Neil Fuller [Thu, 14 Jun 2018 08:21:27 +0000 (08:21 +0000)]
Merge "Add TimestampedValue.toString()"
Lucas Dupin [Thu, 14 Jun 2018 04:29:09 +0000 (21:29 -0700)]
Merge "Smoother wake-up animation" into pi-dev
am:
f910fdb1da
Change-Id: I47833b22c573b67978cb327e8a5b73756618ac0c
TreeHugger Robot [Thu, 14 Jun 2018 04:18:20 +0000 (04:18 +0000)]
Merge "Smoother wake-up animation" into pi-dev
Lucas Dupin [Tue, 12 Jun 2018 22:05:28 +0000 (15:05 -0700)]
Smoother wake-up animation
Removed overlapping interpolators and made the "screen off" animation
slower when more than 1 notifications are visible.
Fixes:
110081253
Bug:
109809484
Test: visual
Change-Id: I355ac94d4e6a880f37ce1d68c15c693b6f09f7f8
Lucas Dupin [Thu, 14 Jun 2018 01:30:24 +0000 (18:30 -0700)]
Merge "Config to enable/disable AOD via overlay" into pi-dev
am:
b784e6f7bc
Change-Id: I7e6d629b9ca6e87a48c332dab470771c4564985d
Lucas Dupin [Thu, 14 Jun 2018 01:16:44 +0000 (01:16 +0000)]
Merge "Config to enable/disable AOD via overlay" into pi-dev
Pengquan Meng [Wed, 13 Jun 2018 23:18:27 +0000 (16:18 -0700)]
[automerger skipped] Merge changes from topic "clean" am:
9f2362bb82
am:
fdad4c89fb -s ours
Change-Id: If0c0f3bfdc0793d07ded76a4d01fec0d439b939e
Benjamin Miller [Wed, 13 Jun 2018 23:12:39 +0000 (16:12 -0700)]
[automerger skipped] Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS. am:
ce3d429832 -s ours
am:
8efa35360f -s ours
Change-Id: Iee13564cbfd41b291ec4eb1020ba76d141ce244b
Lucas Dupin [Wed, 13 Jun 2018 23:07:52 +0000 (16:07 -0700)]
Merge "Avoid showing bouncer when in a launch transition" into pi-dev
am:
a102591e13
Change-Id: I0f3e3be4e7bbd931f8b2ae122276c707f20c153b
Lucas Dupin [Wed, 13 Jun 2018 19:54:29 +0000 (12:54 -0700)]
Config to enable/disable AOD via overlay
Bug:
109894567
Test: mp droid; fastboot -w
Change-Id: I3fda0bf486ae0c4b795ce34ba6823d8dc36a3796
Pengquan Meng [Wed, 13 Jun 2018 22:33:08 +0000 (15:33 -0700)]
Merge changes from topic "clean"
am:
9f2362bb82
Change-Id: I9a0554d7cacd8c02d78ad08b7d05b074720dfe2a
Benjamin Miller [Wed, 13 Jun 2018 22:26:20 +0000 (15:26 -0700)]
[automerger skipped] Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS.
am:
ce3d429832 -s ours
Change-Id: If38c9f39b28e39f26481671bfc7f293e321a26d9
Lucas Dupin [Wed, 13 Jun 2018 22:15:29 +0000 (22:15 +0000)]
Merge "Avoid showing bouncer when in a launch transition" into pi-dev
Robin Lee [Wed, 13 Jun 2018 21:40:21 +0000 (14:40 -0700)]
Merge "Do not treat EXTRA_SMALL_ICON <int> as Parcelable" into pi-dev
am:
82614bed0b
Change-Id: Iae08aea13f79273e6f47d3c32832cd4eddd51010
Robin Lee [Wed, 13 Jun 2018 20:56:11 +0000 (20:56 +0000)]
Merge "Do not treat EXTRA_SMALL_ICON <int> as Parcelable" into pi-dev
Pengquan Meng [Wed, 13 Jun 2018 20:47:13 +0000 (20:47 +0000)]
Merge changes from topic "clean"
* changes:
Remove internal ApnSetting.
Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS.
Laura Davis [Wed, 13 Jun 2018 18:30:50 +0000 (11:30 -0700)]
Merge "docs: repaired link to internal section" into pi-dev
am:
bcae0ff7a2
Change-Id: Iaf2ea420c984004c82cfd71aa3fc4dde566f42f9
Laura Davis [Wed, 13 Jun 2018 18:11:23 +0000 (18:11 +0000)]
Merge "docs: repaired link to internal section" into pi-dev
Evan Laird [Wed, 13 Jun 2018 16:09:03 +0000 (09:09 -0700)]
Merge "Use disableForUser in StatusBarManager" am:
5392d799ab
am:
3f3aa3518f
Change-Id: Ieb7bf7cc8d9fc54b56ec5f8d5caa723357c8ec6e
Evan Laird [Wed, 13 Jun 2018 15:56:41 +0000 (08:56 -0700)]
Merge "Use disableForUser in StatusBarManager"
am:
5392d799ab
Change-Id: I346f8a17d43e65c6e9ed362942345146ad6cac1d
Neil Fuller [Tue, 12 Jun 2018 19:10:22 +0000 (20:10 +0100)]
Fix a syntax error in SystemServiceRegistry
The syntax error was introduced by a bad conflict resolution
in http://ag/
4324946.
Bug:
110097023
Test: Inspection only
Merged-In: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
Change-Id: I546f2d010faa6f75033cf7e3e51ef7ed640854ed
(cherry picked from commit
10e276a24da1b5ac0b27f3172d16c59ef0eeab97)
Neil Fuller [Wed, 13 Jun 2018 14:23:32 +0000 (15:23 +0100)]
Add TimestampedValue.toString()
To make debug logging useful.
Bug:
78217059
Test: Build
Change-Id: I710b56d189afeb26ac50f55d9286d04219779ee7
Treehugger Robot [Wed, 13 Jun 2018 14:19:32 +0000 (14:19 +0000)]
Merge "Use disableForUser in StatusBarManager"
Jorim Jaggi [Wed, 13 Jun 2018 12:49:13 +0000 (05:49 -0700)]
Merge "Enable expanding of status bar just below the notch" into pi-dev
am:
c6c9a78b4e
Change-Id: I7043d9fe30869217750f6968d29a10108a8c497c
Jorim Jaggi [Wed, 13 Jun 2018 12:36:23 +0000 (12:36 +0000)]
Merge "Enable expanding of status bar just below the notch" into pi-dev
yuemingw [Wed, 13 Jun 2018 11:32:13 +0000 (12:32 +0100)]
Remove internal ApnSetting.
Bug:
77511388
Test: atest FrameworksTelephonyTests
Change-Id: I0da354c7d55ac49f90ca1376e8f2034e65e4e274
Merged-In: I9757ef4aae269d828c98a7363c98629c9be74846
Benjamin Miller [Thu, 7 Jun 2018 19:10:08 +0000 (19:10 +0000)]
Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS.
Doc-only change.
Also improved the class descriptions and fixed some typos.
Bug:
80238372
Test: make ds-docs with visual inspection of generated HTML
Change-Id: I460d70d692cc1a04cf0efd6b9d0b1e13a9403968
Merged-In: Id4a00c1a44dc3cbbaefc94c0438eb1a077f06e5e
Robin Lee [Mon, 11 Jun 2018 09:18:55 +0000 (11:18 +0200)]
Do not treat EXTRA_SMALL_ICON <int> as Parcelable
It isn't one, and I should have read the documentation on it properly
before treating it the same as EXTRA_LARGE_ICON (which is indeed a
Parcelable).
This fixes a chronic outpouring of technically-probably-harmless warning
stack traces of the following nature which can be verified by running
the framework tests and grepping logcat for this scary-looking string:
java.lang.ClassCastException: java.lang.Integer cannot be cast to
android.os.Parcelable
at android.os.Bundle.getParcelable(Bundle.java:***)
at android.app.Notification.fixDuplicateExtra
at android.app.Notification.fixDuplicateExtras
at android.app.Notification.readFromParcelImpl
Duplicate Integer objects are harmless compared to the Bitmap so there
is zero sense in recombining the objects after an RPC. We just drop the
line which tries to do that.
Test: make FrameworksCoreTests -j30 && \
Test: adb install -r ${ANDROID_PRODUCT_OUT}/data/app/*/FrameworksCoreTests.apk && \
Test: adb shell am instrument \
Test: -e class android.app.NotificationTest \
Test: -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I2c88ab4e9d5322c05e2e7f68df85ed5b2f296f84
Fix:
79404137
(cherry picked from commit
62eea67846e3817e090031257bae7c42a8407548)
Robert Greenwalt [Tue, 12 Jun 2018 23:07:28 +0000 (16:07 -0700)]
Merge "Use Uppercase instead of Lowercase for PLMN Decode" into pi-dev
am:
2125e5c59e
Change-Id: I850e3f98c9ce4b9221665552b50055bc31f72a04
Adrian Roos [Tue, 12 Jun 2018 23:00:30 +0000 (16:00 -0700)]
Merge "ScreenDecorations: fix cutout not showing in seascape" into pi-dev
am:
f60f4a4761
Change-Id: Ic2cc9abb3e46c610de1d6bab1dc2b99fbdb13f20
Tracy Zhou [Thu, 7 Jun 2018 22:54:29 +0000 (22:54 +0000)]
Revert "Change quickstep onboarding tip window type to"
This reverts commit
4df16fb106fad56e8515da7ea68f6eddf24daf27.
Reason for revert: This change does not really fix the z-layering while this issue is mitigated by the the update of the tip UI. It also causes b/
109836271
Fixes: b/
73990691
Fixes: b/
109836271
Test: Manual test
Change-Id: I6443e7d54e535e353a9ffc71c48ef8b6c3f47972
Andreas Gampe [Tue, 12 Jun 2018 22:42:11 +0000 (15:42 -0700)]
[automerger skipped] Merge "Frameworks: Remove complex boolean" am:
16eef1aad8 -s ours
am:
c997d66018 -s ours
Change-Id: Ic3087510597891dfa5c4fe09573f2de3c8391947
Robert Greenwalt [Tue, 12 Jun 2018 22:26:39 +0000 (22:26 +0000)]
Merge "Use Uppercase instead of Lowercase for PLMN Decode" into pi-dev
Mark Salyzyn [Tue, 12 Jun 2018 22:18:47 +0000 (15:18 -0700)]
Merge "persist.sys.boot.reason is cleared once read by bootstat" am:
8ec0c6ba48
am:
660c145dd1
Change-Id: I587cbdb12fc6be595c312277dcbaa2d63f883f12
TreeHugger Robot [Tue, 12 Jun 2018 22:17:21 +0000 (22:17 +0000)]
Merge "ScreenDecorations: fix cutout not showing in seascape" into pi-dev
Suprabh Shukla [Tue, 12 Jun 2018 22:01:45 +0000 (15:01 -0700)]
Merge "Allow unsuspending critical packages" into pi-dev
am:
5c4b2f6e08
Change-Id: I4507024f882040232905b7e9337964480393a35e
Lucas Dupin [Fri, 8 Jun 2018 21:11:41 +0000 (14:11 -0700)]
Avoid showing bouncer when in a launch transition
The panel will collapse but the bouncer should not become visible,
otherwise the IME might be requested.
Test: go/sysui-bouncer-tests
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
Change-Id: I0405cf1b956aa239b0684ac357a38cf4b2357cb2
Fixes:
109879604
Andreas Gampe [Tue, 12 Jun 2018 21:58:00 +0000 (14:58 -0700)]
[automerger skipped] Merge "Frameworks: Remove complex boolean"
am:
16eef1aad8 -s ours
Change-Id: I407b42d45738599955bca210b5f9896753e51224
Mike Digman [Tue, 12 Jun 2018 21:54:57 +0000 (14:54 -0700)]
Merge "Make rotate nav+qs icon consistent, understandable" into pi-dev
am:
f8dc8e378a
Change-Id: If0731ddfa7fb95e4b810ca80115b4d1c8714a875
Pengquan Meng [Tue, 12 Jun 2018 21:38:22 +0000 (21:38 +0000)]
Merge "Remove internal ApnSetting." into pi-dev-plus-aosp
Mark Salyzyn [Tue, 12 Jun 2018 21:14:03 +0000 (14:14 -0700)]
Merge "persist.sys.boot.reason is cleared once read by bootstat"
am:
8ec0c6ba48
Change-Id: Ib52e362e07a81086e142ff1f120a266862f0a073
TreeHugger Robot [Tue, 12 Jun 2018 21:06:07 +0000 (21:06 +0000)]
Merge "Allow unsuspending critical packages" into pi-dev
Mike Digman [Tue, 12 Jun 2018 20:27:00 +0000 (20:27 +0000)]
Merge "Make rotate nav+qs icon consistent, understandable" into pi-dev
Neil Fuller [Tue, 12 Jun 2018 20:11:34 +0000 (13:11 -0700)]
[automerger skipped] Fix a syntax error in SystemServiceRegistry
am:
10e276a24d -s ours
Change-Id: I79cb70aef217c3ec4bd42f0023e009506836a191
Treehugger Robot [Tue, 12 Jun 2018 19:24:19 +0000 (19:24 +0000)]
Merge "Frameworks: Remove complex boolean"
Neil Fuller [Tue, 12 Jun 2018 19:10:22 +0000 (20:10 +0100)]
Fix a syntax error in SystemServiceRegistry
The syntax error was introduced by a bad conflict resolution
in http://ag/
4324946.
Bug:
110097023
Test: Inspection only
Merged-In: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
Change-Id: I546f2d010faa6f75033cf7e3e51ef7ed640854ed
Treehugger Robot [Tue, 12 Jun 2018 19:19:57 +0000 (19:19 +0000)]
Merge "persist.sys.boot.reason is cleared once read by bootstat"
Evan Laird [Tue, 29 May 2018 21:28:58 +0000 (17:28 -0400)]
Use disableForUser in StatusBarManager
If a secondary user is added to the device and in the middle of SUW, the
SUW process can be killed via ADB. This will cause the process to get
restarted and call StatusBarManager#disable()/disable2(), which uses the
StatusBarManagerService methods that use the current uid.
The fix is to use Binder.getCallingUserHandle() in StatusBarManager so that the
SUW from another user can't affect the current user unless it is
current.
Test: start SUW from new user, cancel set up and go back to primary
user. Kill the SUW process. Nav bars remain un-hidden
Change-Id: Ie6f648827d8d384ae87f74e2d746b7566a7b9011
Fixes:
78360699
Neil Fuller [Tue, 12 Jun 2018 18:26:56 +0000 (11:26 -0700)]
Merge "Simple pass-through TimeDetectorService" am:
cb749e2e50
am:
415585f2a5
Change-Id: Id0259be3d9ad4e869c5e96cb166b8654d52c1ad7
Selim Cinek [Tue, 12 Jun 2018 18:19:08 +0000 (11:19 -0700)]
Merge "Keeping the lockdown state in sync with the notification list" into pi-dev
am:
1d207b3af5
Change-Id: I0ee8ca85bb234e86bbaba0ec7e983861b03546eb
Neil Fuller [Tue, 12 Jun 2018 18:17:51 +0000 (11:17 -0700)]
Merge "Simple pass-through TimeDetectorService"
am:
cb749e2e50
Change-Id: Ic2e3d3c3f9181ef4054f599baf4ac086ec21d8bd
Selim Cinek [Tue, 12 Jun 2018 18:04:01 +0000 (18:04 +0000)]
Merge "Keeping the lockdown state in sync with the notification list" into pi-dev
Andreas Gampe [Tue, 12 Jun 2018 17:37:04 +0000 (10:37 -0700)]
Frameworks: Remove complex boolean
To allow an Errorprone warning to become an error.
Bug:
72451126
Test: m
Change-Id: I8733f0ee74de615e4ffc979fb9de38730c2506c6
Merged-In: Ia6856157e8813856268fba003e1e591d690cb26e
Treehugger Robot [Tue, 12 Jun 2018 17:01:25 +0000 (17:01 +0000)]
Merge "Simple pass-through TimeDetectorService"
Neil Fuller [Fri, 8 Jun 2018 17:44:49 +0000 (18:44 +0100)]
Simple pass-through TimeDetectorService
This is sufficient to wire up time detection from telephony
to the new service without breaking time detection.
This cherry-pick contains a small change: to use
SystemClock.elapsedRealtime() instead of the newer
SystemClock.elapsedRealtimeClock() with Clock.millis().
Bug:
78217059
Test: atest FrameworksServicesTests:com.android.server.timedetector
Test: atest FrameworksCoreTests:android.util.TimestampedValueTest
Merged-In: Id7175878dc22e5272c31f3e478af4b0e4183b62b
Change-Id: Id7175878dc22e5272c31f3e478af4b0e4183b62b
(cherry picked from commit
24836bfb1564b1f98c322108a924965a8dbbee4f)
Chalard Jean [Tue, 12 Jun 2018 14:04:45 +0000 (07:04 -0700)]
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ... am:
6c0106b57f
am:
85bae863f5
Change-Id: Ica8e290909a34976e00bebbb622dd49d8f0d6b8d
Chalard Jean [Tue, 12 Jun 2018 13:57:33 +0000 (06:57 -0700)]
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
am:
6c0106b57f
Change-Id: I86bc83e2bd859b48017f12832e9ff0080ec162b8
yuemingw [Mon, 9 Apr 2018 15:41:54 +0000 (16:41 +0100)]
Remove internal ApnSetting.
Bug:
77511388
Test: atest FrameworksTelephonyTests
Change-Id: I9757ef4aae269d828c98a7363c98629c9be74846
Neil Fuller [Tue, 12 Jun 2018 13:36:14 +0000 (06:36 -0700)]
resolve merge conflicts of
5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb to stage-aosp-master
am:
79d42a61e4
Change-Id: I8dcebef6e996dfaec01934552aa0f3d6f8c9053a
Neil Fuller [Tue, 12 Jun 2018 13:14:13 +0000 (14:14 +0100)]
resolve merge conflicts of
5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic5527b29cbe8c84d2053be849cf09df5341e4790
Chalard Jean [Tue, 12 Jun 2018 12:23:59 +0000 (12:23 +0000)]
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
* changes:
[PT06] Move setGlobalProxy into ProxyTracker
[PT05] Move sendProxyBroadcast into ProxyTracker.
[PT04] Move PacManager into ProxyTracker.
[PT03] Move some more code into ProxyTracker.
[PT02] Move static methods to ProxyTracker
[PT01] Introduce ProxyTracker
Remove a useless parameter.
Small cleanup of Network.
Cleanup of LinkProperties.
Chalard Jean [Thu, 7 Jun 2018 09:37:59 +0000 (18:37 +0900)]
[PT06] Move setGlobalProxy into ProxyTracker
Test: runtest
Change-Id: I6abd2221882db368a411b7174c66d8bd3b6b5110