OSDN Git Service
Jack Yu [Tue, 12 Feb 2019 17:26:30 +0000 (09:26 -0800)]
Merge "Removed unused variables in cat service" am:
9718148ef7 am:
40b897fd7a
am:
b4428a9919
Change-Id: Id9d19239b6e5cd7c0a3c5344cefbdd2c2338df1f
Jack Yu [Tue, 12 Feb 2019 17:14:57 +0000 (09:14 -0800)]
Merge "Removed unused variables in cat service" am:
9718148ef7
am:
40b897fd7a
Change-Id: Id32d50057c15903c57f8ec3f5fe2c151d7150439
Jack Yu [Tue, 12 Feb 2019 17:03:43 +0000 (09:03 -0800)]
Merge "Removed unused variables in cat service"
am:
9718148ef7
Change-Id: I4c2e1bd86a96a2ec73169353d4a9f2da0d0e9c01
Jack Yu [Tue, 12 Feb 2019 16:52:48 +0000 (16:52 +0000)]
Merge "Removed unused variables in cat service"
Gustav Sennton [Tue, 12 Feb 2019 16:44:36 +0000 (16:44 +0000)]
Merge "Test to null-check NotificationEntryManager.performRemoveNotification()"
Oscar Shu [Tue, 12 Feb 2019 16:12:45 +0000 (16:12 +0000)]
Merge "metrics: num saved networks with mac randomization"
Stanislav Zholnin [Tue, 12 Feb 2019 15:27:36 +0000 (15:27 +0000)]
Merge "Add DeviceConfig permissions to manifest so that AppCompactorTest can run after permissions are enforced."
Julia Reynolds [Tue, 12 Feb 2019 14:59:03 +0000 (14:59 +0000)]
Merge "Make notifications from the default dialer and SMS app unblockable."
Michal Karpinski [Tue, 12 Feb 2019 14:55:04 +0000 (14:55 +0000)]
Merge "Push the device owner packageName from DPMS to ATMS instead of calling DPM.isDeviceOwnerApp()"
Michal Karpinski [Tue, 12 Feb 2019 11:51:47 +0000 (11:51 +0000)]
Push the device owner packageName from DPMS to ATMS
instead of calling DPM.isDeviceOwnerApp()
Due to lock ordering AM/ATM cannot call DPM directly.
Bug:
123950811
Test: atest WmTests:ActivityStarterTests
Test: atest FrameworksServicesTests:DevicePolicyManagerTest
Test: manual with TestDPC (set DO, reboot device, etc.)
Change-Id: I14c6f48fe07243fe324ea41e9403c37aaceea304
TreeHugger Robot [Tue, 12 Feb 2019 12:24:48 +0000 (12:24 +0000)]
Merge "Compatible behavior for non-resizable activity (1/N)"
TreeHugger Robot [Tue, 12 Feb 2019 12:23:56 +0000 (12:23 +0000)]
Merge "Compatible behavior for non-resizable activity (2/N)"
TreeHugger Robot [Tue, 12 Feb 2019 12:23:45 +0000 (12:23 +0000)]
Merge "Support touch event on letterbox surface"
Olivier Gaillard [Tue, 12 Feb 2019 11:56:26 +0000 (11:56 +0000)]
Merge "Marks the bucket as invalid when it reaches the guard rail limit."
Mathieu Chartier [Tue, 12 Feb 2019 11:11:33 +0000 (11:11 +0000)]
Merge "Revert "Revert "Add view inflation device config property"""
TreeHugger Robot [Tue, 12 Feb 2019 10:57:42 +0000 (10:57 +0000)]
Merge "Renames ChunkListing.java to ChunkListingMap.java."
TreeHugger Robot [Tue, 12 Feb 2019 10:39:33 +0000 (10:39 +0000)]
Merge "Fix flaky AppWindowTokenTests"
Stanislav Zholnin [Fri, 8 Feb 2019 17:17:43 +0000 (17:17 +0000)]
Add DeviceConfig permissions to manifest so that AppCompactorTest
can run after permissions are enforced.
Test: atest AppCompactorTest
Change-Id: Ie0994d3fc539f1305d7c8c153d0116d605ae03f6
Yohei Yukawa [Tue, 12 Feb 2019 10:01:10 +0000 (02:01 -0800)]
Log user IDs for both IME and IME-client in StartInputHistory
This is a follow up CL to my recent CL [1], which added an @hide API
EditorInfo#targetInputMethodUser for privileged components such as
System UI to be able to override the expected IME user, based on their
INTERACT_ACROSS_USERS_FULL permission. This is critical for
per-profile IME mode and direct-reply to coexist.
To make it easier to diagnose this new scenario, this CL updates our
retrospective debugging mechanism called StartInputHistory [2]. With
this CL, InputMethodManagerService starts keeping track of both IME
user ID and IME client user ID for each StartInput so that we can see
them later into the StartInputHistory section of the bugreport.
For Direct-Reply scenario for instance, we would see a log like this:
... imeUserId=10 ... targetUserId=0 ...
There should be no user-visible behavior change.
[1]: Ia7ea944438d69669ccdf9111b34ba400e786a602
0f5eade4a492fc91130da1aedcad0999932f4137
[2]: Icb29c4ef0703553ead8654d3255a554de6d1a9b4
357b2f60e147d18af9c8399b346a9e63de1baaf3
Bug:
35079353
Bug:
120744418
Test: Manually verified as follows.
1. Build aosp_taimen-userdebug and flash it.
2. adb shell pm create-user test_user
3. adb shell am switch-user 10
4. make -j EditTextVariations
5. adb install -r \
$ANDROID_TARGET_OUT_TESTCASES/EditTextVariations/EditTextVariations.apk
6. adb shell am start \
-n com.android.inputmethod.tools.edittextvariations/.EditTextVariations
7. Tap the menu icon on the EditTextVariations then click "Direct Reply"
8. Open notification shade.
9. Tap reply icon on "Message from UserHandle{10}".
10. Make sure that AOSP Keyboard is shown.
11. adb shell dumpsys input_method
12. Make sure that you can see both "imeUserId=10" and
"targetUserId=0" in the last StartInputHistory.
Change-Id: Ica21e2f4cb41c7a5f4195f08f05220e2f65c1bf1
Yohei Yukawa [Tue, 12 Feb 2019 10:01:00 +0000 (02:01 -0800)]
Log display IDs for both IME and IME-client in StartInputHistory
This is a follow up CL to a recent CL [1], which added a special
fallback mechanism for IMEs to be shown on the default display when
the target display doesn't have FLAG_CAN_SHOW_SYSTEM_DECORATIONS.
It turns out that this scenario will soon become more user-visible
once Bubble UI is enabled, because Bubble UI is built on top of
ActivityView, where the target Activity including any text input field
will be running on a virtual display, not on the default display,
while IMEs are expected to continue running on the default display.
To make it easier to diagnose this new scenario, this CL updates our
retrospective debugging mechanism called StartInputHistory [2]. With
this CL, InputMethodManagerService starts keeping track of both IME
display ID and IME client display ID for each StartInput so that we
can see them later into the StartInputHistory section of the
bugreport.
For Bubble UI scenario for instance, we would see a log like this:
... imeDisplayId=0 ... targetDisplayId=1 ...
There should be no user-visible behavior change.
[1]: Iedd71e4ddf4983f90b02dd72e471e7fa8e838fbf
ef1965bd6d6061cb54bce305a4b99e640db19ddc
[2]: Icb29c4ef0703553ead8654d3255a554de6d1a9b4
357b2f60e147d18af9c8399b346a9e63de1baaf3
Bug:
35079353
Bug:
114350902
Test: Manually verified with Bubble test app and run 'adb shell
dumpsys input_method' to see that a virtual display ID is logged
when typing on Bubble UI.
Change-Id: I6f40d86a03a7965d72af7e9a1b6466350b7dfab7
Olivier Gaillard [Mon, 11 Feb 2019 18:08:43 +0000 (18:08 +0000)]
Marks the bucket as invalid when it reaches the guard rail limit.
It only impacts the BinderCallsStats atoms currently.
Bug:
120130099
Test: atest statsd_test
Change-Id: I8ba8d7cbe8798c1c503be8897a27a0729efe77d7
Yohei Yukawa [Tue, 12 Feb 2019 09:42:56 +0000 (01:42 -0800)]
Hide InputMethodManger.showSoftInputUnchecked() from Q+ apps
This is a follow up CL to my previous CL [1], which declared that
InputMethodManger.showSoftInputUnchecked() was deprecated and should
have never be used any more.
At that time, however, we could not simply remove that hidden API
because android.support.v7.widget.SearchView had been used it via
reflection and the reflection code was already statically linked into
many apps in the ecosystem. What we could do at that time was getting
rid of this hidden API dependency from support lib v26 [2] and making
sure that a clear warning was shown in logcat if apps were still using
older support lib [3].
Almost two years later now, it's probably time to step forward towards
true deprecation of this hidden API. With this CL, apps that target
Q+ can no longer call this method.
[1]: I20983e4ce1d625e098a8c2335ce75994cfa43235
5cfc1b4c104471a6f4d0edc8a1b60cbc9a54d78f
[2]: Iaac4673a85c141c787b96fb39806346ccfb85fb3
fd44fffced7cce36c1ce0d62dfe2542aa6a7c6e9
[3]: If01316a0c2a210f9ea03b53700d0ef651955ba9c
101ae464fcd4b1ffd226f3c4ea2d2d951cf4e0e7
Bug:
36015425
Fix:
123768499
Test: make -j checkbuild
Change-Id: Ie7362f62f1e947ee5a21b90f5150c69f2970d73d
TreeHugger Robot [Tue, 12 Feb 2019 09:31:52 +0000 (09:31 +0000)]
Merge "Revert changes for moving MediaSessionService into AML"
Android Build Merger (Role) [Tue, 12 Feb 2019 09:31:15 +0000 (09:31 +0000)]
Merge "Merge "Add getOrCreateCanonicalAddressId" am:
efc16ab0d8 am:
5854e9312c am:
3179ad0d40"
Martijn Coenen [Tue, 12 Feb 2019 09:29:42 +0000 (09:29 +0000)]
Merge "Fix min uid/gid allowed for child zygotes."
Bram Bonné [Thu, 7 Feb 2019 10:40:10 +0000 (11:40 +0100)]
Renames ChunkListing.java to ChunkListingMap.java.
Bug:
111386661
Test: atest RunBackupFrameworksServicesRoboTests
Change-Id: I94327204ed39b4b4a6138eb6ddd1b28732a16363
Leland Miller [Tue, 12 Feb 2019 09:28:43 +0000 (01:28 -0800)]
Merge "Add getOrCreateCanonicalAddressId" am:
efc16ab0d8 am:
5854e9312c
am:
3179ad0d40
Change-Id: Idbd353963c8dcfa245c39c8b78a48ae43fa8bc76
TreeHugger Robot [Tue, 12 Feb 2019 09:21:36 +0000 (09:21 +0000)]
Merge "Verify the pinned stack boundary when adjusting offset."
Leland Miller [Tue, 12 Feb 2019 09:15:11 +0000 (01:15 -0800)]
Merge "Add getOrCreateCanonicalAddressId" am:
efc16ab0d8
am:
5854e9312c
Change-Id: Ic5c0c71c4a2ae548bf4ff697af4e9ecc7a0b90bc
Leland Miller [Tue, 12 Feb 2019 09:05:56 +0000 (01:05 -0800)]
Merge "Add getOrCreateCanonicalAddressId"
am:
efc16ab0d8
Change-Id: Iac6050138195b612815721e00241d9b31d3a580a
Leland Miller [Tue, 12 Feb 2019 08:54:04 +0000 (08:54 +0000)]
Merge "Add getOrCreateCanonicalAddressId"
Yunfan Chen [Thu, 7 Feb 2019 10:08:41 +0000 (19:08 +0900)]
Fix flaky AppWindowTokenTests
The only one failure test is marked with corresponding bug ID. Other
flakiness are fixed.
We need to push a guard task when waiting for handler empty to ensure
all the posted tasks is finished after calling the waitHandlerIdle.
Otherwise, it is possible that the assertion happens before the posted
runnable method finished, which will cause fail, and flakiness.
There was a change by default skip onParentChange call for
TestAppWindowToken which breaks the tests. Set the flag correctly in
setUp fixed it.
Bug:
69229402
Bug:
68267650
Test: atest AppWindowTokenTests. All tests other than flaky one should
get a stable pass.
Change-Id: If485232d676604ec4a5b8d2c9e097fd9794d916e
Yunfan Chen [Tue, 12 Feb 2019 08:23:53 +0000 (08:23 +0000)]
Merge "Fix testLandscapeSeascapeRotationByApp failure"
Mark Chien [Tue, 12 Feb 2019 08:05:11 +0000 (08:05 +0000)]
Merge "Support multi-SIM entitlement check"
Riddle Hsu [Mon, 21 Jan 2019 13:48:16 +0000 (21:48 +0800)]
Compatible behavior for non-resizable activity (2/N)
Scale and offset activity with compatibility bounds horizontally.
This reuses the existing scaling flow of compatibility mode,
so the insets scaling is also handled when computing frames.
Bug:
112288258
Test: atest AppWindowTokenTests#testSizeCompatBounds
Change-Id: I42a3fae7cd27f3ab6d79d885bedbea2e34874d01
Yunfan Chen [Tue, 12 Feb 2019 06:05:49 +0000 (15:05 +0900)]
Fix testLandscapeSeascapeRotationByApp failure
The test was failed because the DC will have mWaitingForConfig flag set
to true when updateOrientationFromAppTokens called. However, as this is
a test for AppWindowToken, we will not send a new config to the DC. This
flag will remain true and prevent handleResizingWindows handle the
WindowState correctly.
Set the flag to false to fix it.
Test: atest AppWindowTokenTests
Bug:
68267650
Bug:
124088319
Change-Id: I97cf5aa82d0a955e3422fa99523ec405d8e72693
TreeHugger Robot [Tue, 12 Feb 2019 06:21:21 +0000 (06:21 +0000)]
Merge "Remove potential duplicate runnable + add logging"
Remi NGUYEN VAN [Tue, 12 Feb 2019 05:20:07 +0000 (21:20 -0800)]
Merge "Remove INTERACT_ACROSS_USERS_FULL for NetworkStack" am:
749dfc3083 am:
082034a6dd
am:
67e46255ea
Change-Id: I57248b9294e239d031dcf36cf75e94bf58919701
Remi NGUYEN VAN [Tue, 12 Feb 2019 05:10:20 +0000 (21:10 -0800)]
Merge "Remove INTERACT_ACROSS_USERS_FULL for NetworkStack" am:
749dfc3083
am:
082034a6dd
Change-Id: I9fa86a2487d7ef3a98016fda4e5cc2228bf9e519
Remi NGUYEN VAN [Tue, 12 Feb 2019 05:00:12 +0000 (21:00 -0800)]
Merge "Remove INTERACT_ACROSS_USERS_FULL for NetworkStack"
am:
749dfc3083
Change-Id: I62722875e52b1fc5486dda9a3368eb045808c1db
Yunfan Chen [Tue, 12 Feb 2019 04:57:22 +0000 (04:57 +0000)]
Merge "Move flaky to single test level instead of class level"
Remi NGUYEN VAN [Tue, 12 Feb 2019 04:47:43 +0000 (04:47 +0000)]
Merge "Remove INTERACT_ACROSS_USERS_FULL for NetworkStack"
Remi NGUYEN VAN [Tue, 12 Feb 2019 04:44:47 +0000 (20:44 -0800)]
Merge "Remove hard-coded NetworkStack package name" am:
e765e8b7aa am:
d49230d8df
am:
a6391b14d2
Change-Id: Ic93c22e03a4ead4ec37b955993a32c8ce284e0a6
Android Build Merger (Role) [Tue, 12 Feb 2019 04:36:04 +0000 (04:36 +0000)]
Merge "Merge "Grant Shell ability to clear instant app" am:
f5a0e41e18 am:
7282c21b57 am:
57ee0ed8d2"
Sergii Piatakov [Tue, 12 Feb 2019 04:35:33 +0000 (20:35 -0800)]
Merge "Grant Shell ability to clear instant app" am:
f5a0e41e18 am:
7282c21b57
am:
57ee0ed8d2
Change-Id: I8a6d3b87d3bf0711fcd70f9965164b46a789b9fb
Jeff Sharkey [Tue, 12 Feb 2019 04:35:29 +0000 (04:35 +0000)]
Merge "Keep "Storage" legacy permission granted."
Remi NGUYEN VAN [Tue, 12 Feb 2019 04:34:20 +0000 (20:34 -0800)]
Merge "Remove hard-coded NetworkStack package name" am:
e765e8b7aa
am:
d49230d8df
Change-Id: If82997f9f46a34014e797f10a71c34bfb4150585
Colin Cross [Tue, 12 Feb 2019 04:27:57 +0000 (20:27 -0800)]
Merge "Unzip offline-sdk-docs for m offline-sdk-docs or m docs" am:
a217211cc9 am:
993b44470f
am:
b7f18a178a
Change-Id: Id36de524242738cb0d55b2e68f59d1ede32d7546
Remi NGUYEN VAN [Tue, 12 Feb 2019 04:22:40 +0000 (20:22 -0800)]
Merge "Remove hard-coded NetworkStack package name"
am:
e765e8b7aa
Change-Id: I0e67a5e857d4f5ba2af1f0928be6d97c0f4ce94f
Sergii Piatakov [Tue, 12 Feb 2019 04:17:49 +0000 (20:17 -0800)]
Merge "Grant Shell ability to clear instant app" am:
f5a0e41e18
am:
7282c21b57
Change-Id: I9cd6d8bad270bd25633dd851eb83a24cec16ce7b
Android Build Merger (Role) [Tue, 12 Feb 2019 04:14:28 +0000 (04:14 +0000)]
Merge "[automerger skipped] Merge "Add get/set PreferredNetworkTypeBitmap" am:
0beb397fa5 am:
865ce409d3 am:
b30c34142c -s ours am skip reason: change_id Icbd3b2108ce8eb75e863dcf38fb8249c1e37ea91 with SHA1
6d8e76f08a is in history"
Pengquan Meng [Tue, 12 Feb 2019 04:13:58 +0000 (20:13 -0800)]
[automerger skipped] Merge "Add get/set PreferredNetworkTypeBitmap" am:
0beb397fa5 am:
865ce409d3
am:
b30c34142c -s ours
am skip reason: change_id Icbd3b2108ce8eb75e863dcf38fb8249c1e37ea91 with SHA1
6d8e76f08a is in history
Change-Id: I622dd00eb0eed98de6001d9294e7c84ff0482363
Colin Cross [Tue, 12 Feb 2019 04:12:19 +0000 (20:12 -0800)]
Merge "Unzip offline-sdk-docs for m offline-sdk-docs or m docs" am:
a217211cc9
am:
993b44470f
Change-Id: Ica7b01d5b77aa361964672f6db5c79b13ea944aa
Tej Singh [Tue, 12 Feb 2019 04:11:07 +0000 (04:11 +0000)]
Merge "Statsd Puller Callback Registration"
Sergii Piatakov [Tue, 12 Feb 2019 03:58:13 +0000 (19:58 -0800)]
Merge "Grant Shell ability to clear instant app"
am:
f5a0e41e18
Change-Id: I3adc12a8ffab9f81b97fc8e5feee80a471faef05
Remi NGUYEN VAN [Tue, 12 Feb 2019 03:58:09 +0000 (03:58 +0000)]
Merge "Remove hard-coded NetworkStack package name"
Colin Cross [Tue, 12 Feb 2019 03:53:50 +0000 (19:53 -0800)]
Merge "Unzip offline-sdk-docs for m offline-sdk-docs or m docs"
am:
a217211cc9
Change-Id: I9a32d380bacc6084cd0bdb2ce940dc6cf19ed694
Kiyoung Kim [Tue, 12 Feb 2019 03:45:46 +0000 (19:45 -0800)]
[automerger skipped] Merge "Schematize Display system properties" am:
db5c59214f am:
e3f4f5eedb
am:
6b419380e3 -s ours
am skip reason: change_id Id9bbb997669b05b6edb5307d561e766ead19abf1 with SHA1
0fe161dffd is in history
Change-Id: I0b89a0ed972e9afe308b55f641ca9cd5cb194349
Treehugger Robot [Tue, 12 Feb 2019 03:42:40 +0000 (03:42 +0000)]
Merge "Grant Shell ability to clear instant app"
Pengquan Meng [Tue, 12 Feb 2019 03:37:53 +0000 (19:37 -0800)]
Merge "Add get/set PreferredNetworkTypeBitmap" am:
0beb397fa5
am:
865ce409d3
Change-Id: I57d52d5831e51a90c35bb3e9ca01ac5cf5e78046
Treehugger Robot [Tue, 12 Feb 2019 03:36:58 +0000 (03:36 +0000)]
Merge "Unzip offline-sdk-docs for m offline-sdk-docs or m docs"
TreeHugger Robot [Tue, 12 Feb 2019 03:34:25 +0000 (03:34 +0000)]
Merge "Postpone destroying leash until after cancel callback."
Mark Renouf [Tue, 12 Feb 2019 03:33:22 +0000 (03:33 +0000)]
Merge changes Ie79a67d3,Ifb548a30
* changes:
Adds displayId to android.app.TaskInfo
Fixes missing FLAG_ACTIVIY_NEW_TASK in startActivity
Kiyoung Kim [Tue, 12 Feb 2019 03:24:54 +0000 (19:24 -0800)]
Merge "Schematize Display system properties" am:
db5c59214f
am:
e3f4f5eedb
Change-Id: Iae50263941eed58171d9bf8d6cf47ab79362a977
Pengquan Meng [Tue, 12 Feb 2019 03:24:08 +0000 (19:24 -0800)]
Merge "Add get/set PreferredNetworkTypeBitmap"
am:
0beb397fa5
Change-Id: I2f03626693d9e933b92f51e8b02d0a977cb202a6
Kiyoung Kim [Tue, 12 Feb 2019 03:13:06 +0000 (19:13 -0800)]
Merge "Schematize Display system properties"
am:
db5c59214f
Change-Id: I363f989b8259adccc86c85708e64fcb05222e6fc
Pengquan Meng [Tue, 12 Feb 2019 03:08:57 +0000 (03:08 +0000)]
Merge "Add get/set PreferredNetworkTypeBitmap"
wilsonshih [Fri, 25 Jan 2019 01:03:47 +0000 (09:03 +0800)]
Verify the pinned stack boundary when adjusting offset.
When user touch home key and moved activity to pinned stack, Nexus
launcher also calls setShelfHeight to adjust pinned bounds, and then the
PinnedStackController sends the animation bounds to system ui to update
it to current bounds.
However, if system ui receives this bounds before system server process
configuration changes(such as rotation), the bounds sent to system ui will
become obsolete. Then system ui will call
ActivityTaskManager#resizeStack to overwrite the correct bounds with
the obsolete one.
In this case, what system ui want to do is adjust the PIP position with
an offset, so sending an offset is sufficient instead of sending a new
bounds to system server.
Fix:
122058651
Test: Manual test the pinned stack can be adjust with show/hide IME and shelf.
Test: atest ActivityManagerPinnedStackTests ActivityManagerAppConfigurationTests
Change-Id: I5e9271812c00b8e1d45af7a774b99b780102ad23
Treehugger Robot [Tue, 12 Feb 2019 02:50:08 +0000 (02:50 +0000)]
Merge "Schematize Display system properties"
Yunfan Chen [Fri, 8 Feb 2019 07:51:28 +0000 (16:51 +0900)]
Move flaky to single test level instead of class level
This will promote more tests into pre-submit. The standard is, if a test
is shown stable in the past 7 days, the flaky is removed.
Some clean-up also applied.
Bug:
123654474
Test: pre-submit
Change-Id: I4d0563eae9e3e7db4e6cffb2630c5930865ae1aa
TreeHugger Robot [Tue, 12 Feb 2019 02:22:40 +0000 (02:22 +0000)]
Merge "Ensure AlarmManager is brought out of device idle."
Android Build Merger (Role) [Tue, 12 Feb 2019 02:06:05 +0000 (02:06 +0000)]
Merge "Merge "Convert Android.mk file to Android.bp" am:
190ff7457c am:
4bb2c54698 am:
8d838a3ced"
Sasha Smundak [Tue, 12 Feb 2019 02:05:30 +0000 (18:05 -0800)]
Merge "Convert Android.mk file to Android.bp" am:
190ff7457c am:
4bb2c54698
am:
8d838a3ced
Change-Id: I2c2c5ccb7da321ee7896e01131f84090797eb6db
TreeHugger Robot [Tue, 12 Feb 2019 02:02:15 +0000 (02:02 +0000)]
Merge "Add setting for Aware allowed/disallowed"
Sasha Smundak [Tue, 12 Feb 2019 01:53:49 +0000 (17:53 -0800)]
Merge "Convert Android.mk file to Android.bp" am:
190ff7457c
am:
4bb2c54698
Change-Id: Ic6c3b63a6f21a8af4527406db163698fdf47c642
Android Build Merger (Role) [Tue, 12 Feb 2019 01:49:38 +0000 (01:49 +0000)]
Merge "Merge "Make isRebootRequiredForModemConfigChange SystemApi" am:
55faf37439 am:
367a7baf96 am:
a2cbf01609"
Nazanin Bakhshi [Tue, 12 Feb 2019 01:47:51 +0000 (17:47 -0800)]
Merge "Make isRebootRequiredForModemConfigChange SystemApi" am:
55faf37439 am:
367a7baf96
am:
a2cbf01609
Change-Id: I14564c836466694523eb25a352b0ec39c73e919e
Robert Lee [Tue, 12 Feb 2019 01:44:25 +0000 (01:44 +0000)]
Merge "Add DEGRADE into HardwareErrorCode"
Sasha Smundak [Tue, 12 Feb 2019 01:41:35 +0000 (17:41 -0800)]
Merge "Convert Android.mk file to Android.bp"
am:
190ff7457c
Change-Id: I386b44574ddb4b946536805c467c0c46333f2fa8
Courtney Goeltzenleuchter [Tue, 12 Feb 2019 01:33:01 +0000 (01:33 +0000)]
Merge "Must return after throwing exception"
Sasha Smundak [Tue, 12 Feb 2019 01:31:35 +0000 (17:31 -0800)]
Merge "Convert Android.mk file to Android.bp" am:
c7ec1a8961 am:
36a96976b1
am:
89ce4bd4e1
Change-Id: Id008e4f56683d874568ab7f86f27edfe2353ba62
Treehugger Robot [Tue, 12 Feb 2019 01:24:44 +0000 (01:24 +0000)]
Merge "Convert Android.mk file to Android.bp"
Joseph Pirozzo [Tue, 12 Feb 2019 01:24:00 +0000 (17:24 -0800)]
Merge "Check PBAP Server before disconnecting" am:
87d1cdd45e am:
7128032d13
am:
e005b50ebb
Change-Id: I3e20e07f76c2fc90aaee0fe949e9fabf3137d920
Nazanin Bakhshi [Tue, 12 Feb 2019 01:21:50 +0000 (17:21 -0800)]
Merge "Make isRebootRequiredForModemConfigChange SystemApi" am:
55faf37439
am:
367a7baf96
Change-Id: I23e289d24c918004596a465f3f572b63bb0f0879
Phil Weaver [Tue, 12 Feb 2019 01:12:54 +0000 (17:12 -0800)]
Merge "Add owners for accessibility" am:
bbbeba3c02 am:
a525ea4436
am:
c36e36b87e
Change-Id: Iaa5653b02e99a149186a99f3fda28111263aa2ad
Sasha Smundak [Tue, 12 Feb 2019 01:11:01 +0000 (17:11 -0800)]
Merge "Convert Android.mk file to Android.bp" am:
c7ec1a8961
am:
36a96976b1
Change-Id: Ib15faa15306d01d472b568d58685c61bdc5e88c5
Jordan Liu [Tue, 12 Feb 2019 01:05:27 +0000 (17:05 -0800)]
Merge "Clarify PhoneStateListener documentation" am:
69a0fb35a6 am:
ed6a99546d
am:
f9b483a05b
Change-Id: I607bc59ea4690d9060bc0222af2aa8f87d49d6cf
Joseph Pirozzo [Tue, 12 Feb 2019 01:04:40 +0000 (17:04 -0800)]
Merge "Check PBAP Server before disconnecting" am:
87d1cdd45e
am:
7128032d13
Change-Id: I4cebaf6741c2f1a6ee567ee8fc0afa5ae5ddc43e
Nazanin Bakhshi [Tue, 12 Feb 2019 01:02:16 +0000 (17:02 -0800)]
Merge "Make isRebootRequiredForModemConfigChange SystemApi"
am:
55faf37439
Change-Id: I0573ed432fbc56ccf8db2f1d5263705ce0456bfe
Sasha Smundak [Tue, 12 Feb 2019 00:56:20 +0000 (16:56 -0800)]
Merge "Convert Android.mk file to Android.bp"
am:
c7ec1a8961
Change-Id: I79336080bf8e809514b1c6282103ae2ecaf1facb
Android Build Merger (Role) [Tue, 12 Feb 2019 00:55:02 +0000 (00:55 +0000)]
Merge "Merge "Add API to check if a SIM card matches carrier restrictions." am:
31e933cf78 am:
1f2a143d98 am:
2f771755f6"
Michele Berionne [Tue, 12 Feb 2019 00:53:30 +0000 (16:53 -0800)]
Merge "Add API to check if a SIM card matches carrier restrictions." am:
31e933cf78 am:
1f2a143d98
am:
2f771755f6
Change-Id: Iefe13ddd6dc15330fc3c467f120b403e82f8a4bc
Phil Weaver [Tue, 12 Feb 2019 00:53:13 +0000 (16:53 -0800)]
Merge "Add owners for accessibility" am:
bbbeba3c02
am:
a525ea4436
Change-Id: Ia828c34be1f1dac6ea58ce0e68cf032f058dbb0b
TreeHugger Robot [Tue, 12 Feb 2019 00:52:24 +0000 (00:52 +0000)]
Merge "Update digital clock based on latest mocks."
TreeHugger Robot [Tue, 12 Feb 2019 00:47:56 +0000 (00:47 +0000)]
Merge "Exposed even moar DeviceConfig APIs for testing."
Jordan Liu [Tue, 12 Feb 2019 00:46:51 +0000 (16:46 -0800)]
Merge "Clarify PhoneStateListener documentation" am:
69a0fb35a6
am:
ed6a99546d
Change-Id: Iad4698465d84ce9874bd9526ed066729f83185b6
Joseph Pirozzo [Tue, 12 Feb 2019 00:45:21 +0000 (16:45 -0800)]
Merge "Check PBAP Server before disconnecting"
am:
87d1cdd45e
Change-Id: I614fb1ec9b0d30df6f9879f6c0a46013941df439
Nazanin Bakhshi [Tue, 12 Feb 2019 00:37:43 +0000 (00:37 +0000)]
Merge "Make isRebootRequiredForModemConfigChange SystemApi"
Xiangyu/Malcolm Chen [Tue, 12 Feb 2019 00:36:05 +0000 (16:36 -0800)]
[automerger skipped] Merge changes from topics "
118348832", "
120945564" am:
52a31598e7 am:
0c15f98874
am:
cfab2e7015 -s ours
am skip reason: change_id I7e9e18728a1db9fd31e92164d72b6656b964f1f4 with SHA1
990903bc00 is in history
Change-Id: I26b5e338e6b13af6fef57f9eff0eb182ebe3a397
Phil Weaver [Tue, 12 Feb 2019 00:34:27 +0000 (16:34 -0800)]
Merge "Add owners for accessibility"
am:
bbbeba3c02
Change-Id: I099187d207d5610bc79d630f105bff2de41481c3