OSDN Git Service
Remi NGUYEN VAN [Thu, 11 Apr 2019 17:29:59 +0000 (10:29 -0700)]
Merge "Freeze netd AIDL interface (framework)" am:
eb8d81ca14
am:
e427c17917
Change-Id: Ib852b0555f0e20b858f9dd0b16dbd98dbbd22b55
Jeff Vander Stoep [Thu, 11 Apr 2019 17:25:02 +0000 (10:25 -0700)]
[automerger skipped] Merge "Disable XOM on libraries for apps with targetSdkVerison<Q" am:
e7b20fbae9
am:
255db3ee0c -s ours
am skip reason: change_id I90b5c91923c8008ae4b4818985842fe3e354a850 with SHA1
739c0b5193 is in history
Change-Id: I5730851fc349e97fd88ec7839c075d573f8ac3e9
Jack Yu [Thu, 11 Apr 2019 17:20:12 +0000 (10:20 -0700)]
[automerger skipped] Merge "Allow GSM RSSI levels to be customized by CarrierConfig" am:
5ab0dd0aa0
am:
b71dc1e65d -s ours
am skip reason: change_id I61afd1f07564c0df886b0e30d27ea2a059b484dc with SHA1
186a87b003 is in history
Change-Id: I9467b72216c37c325d796d4cbb9e16dd5376bab3
David Brazdil [Thu, 11 Apr 2019 17:14:53 +0000 (10:14 -0700)]
Merge "Update AppComponentFactory.instantiateClassLoader docs" am:
352021b4aa
am:
469fb50385
Change-Id: Ice6805ac3e84176f4de1a16972de693c043149bd
Nathan Harold [Thu, 11 Apr 2019 17:10:13 +0000 (10:10 -0700)]
[automerger skipped] Merge "Update Javadocs for CellInfo Classes" am:
a49f1b725f
am:
6c708a7d57 -s ours
am skip reason: change_id I61d645f79a23226ab902fc657fe7b07ffd674a0b with SHA1
78cf8acf00 is in history
Change-Id: I30f83ce66b35b5154dd5d927d49d63eacbca09c1
Benedict Wong [Thu, 11 Apr 2019 17:05:20 +0000 (10:05 -0700)]
Merge changes I98573a5c,Ic7394f24 am:
c6ce6fc841
am:
ed4f59e264
Change-Id: I279765199a80b0639dde31302778a95c0f9fd705
Android Build Merger (Role) [Thu, 11 Apr 2019 16:59:18 +0000 (16:59 +0000)]
Merge "Merge "Update TelMan API for testing Line1NumberForDisplay." am:
d09bd9d9f6 am:
bd95271170" into qt-dev-plus-aosp
Cody Kesting [Thu, 11 Apr 2019 16:58:46 +0000 (09:58 -0700)]
Merge "Update TelMan API for testing Line1NumberForDisplay." am:
d09bd9d9f6
am:
bd95271170
Change-Id: I1ee422c3b23a59abccd65229804183b070d1d66f
Mady Mellor [Thu, 11 Apr 2019 16:56:57 +0000 (09:56 -0700)]
Merge "Drop the 'initial' of suppressInitialNotification API" into qt-dev
am:
d8913d7eac
Change-Id: I6096370bee4970c3aaa369430d50207233d22d98
Chen Xu [Thu, 11 Apr 2019 16:40:16 +0000 (09:40 -0700)]
Merge "throw securityexception for notifyNetworkChange" into qt-dev
am:
d81cd26296
Change-Id: Iaaa2db8cf6a65c540dc4e09f3a4761f123b87081
Tony Mak [Thu, 11 Apr 2019 16:34:17 +0000 (09:34 -0700)]
Merge "Remove remaining deepCopy() usages in TextClassifier" into qt-dev
am:
ac3d917aa3
Change-Id: I6abf490577424d6f8f9d83ecc9b15d027ec3773d
Zimuzo Ezeozue [Thu, 11 Apr 2019 16:28:36 +0000 (09:28 -0700)]
Merge "Fixed PackageWatchdog health check state" into qt-dev
am:
f4e878d7ce
Change-Id: If810c549744ff6bcaff08b25d661ae4cdd8022a5
Mady Mellor [Thu, 11 Apr 2019 16:28:34 +0000 (16:28 +0000)]
Merge "Drop the 'initial' of suppressInitialNotification API" into qt-dev
Po-Chien Hsueh [Thu, 11 Apr 2019 16:21:07 +0000 (09:21 -0700)]
Merge "Retry getting DynamicSystem service" into qt-dev
am:
1c891d6772
Change-Id: If322945def546d6159ed42dcff9efcd5159a1c1d
Chen Xu [Thu, 11 Apr 2019 15:56:02 +0000 (15:56 +0000)]
Merge "throw securityexception for notifyNetworkChange" into qt-dev
TreeHugger Robot [Thu, 11 Apr 2019 15:54:52 +0000 (15:54 +0000)]
Merge "Remove remaining deepCopy() usages in TextClassifier" into qt-dev
Zimuzo Ezeozue [Thu, 11 Apr 2019 15:54:46 +0000 (15:54 +0000)]
Merge "Fixed PackageWatchdog health check state" into qt-dev
TreeHugger Robot [Thu, 11 Apr 2019 15:53:52 +0000 (15:53 +0000)]
Merge "Retry getting DynamicSystem service" into qt-dev
Matt Pietal [Thu, 11 Apr 2019 15:48:05 +0000 (08:48 -0700)]
Merge "Sharesheet - 4->8 direct share expansion fix" into qt-dev
am:
43e9ec2354
Change-Id: I1fb4fb1cd87eb15a0e20703bd54bdbd4a5b082ee
Winson Chung [Thu, 11 Apr 2019 15:40:51 +0000 (08:40 -0700)]
Merge "Add state callbacks to launcher" into qt-dev
am:
71d3450762
Change-Id: I08c1bff288f8937744e19a96c3032c32e9f6ffb9
Bill Yi [Thu, 11 Apr 2019 15:33:54 +0000 (08:33 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
6ba3be1044 -s ours
am skip reason: subject contains skip directive
Change-Id: I99383bcc5ebb5f22eb3b79e7f8c622efc7132150
Bill Yi [Thu, 11 Apr 2019 15:32:37 +0000 (08:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
507bcb189f -s ours
am skip reason: subject contains skip directive
Change-Id: I8e505cf5b97847388b0e05399ea961d64d3131bf
Todd Kennedy [Thu, 11 Apr 2019 15:31:03 +0000 (08:31 -0700)]
Merge "Update comment per review feedback" into qt-dev
am:
2d8c54a532
Change-Id: I46025e4c604614b522eb4f89a6db03d8d2b060c8
Matt Pietal [Thu, 11 Apr 2019 15:30:34 +0000 (15:30 +0000)]
Merge "Sharesheet - 4->8 direct share expansion fix" into qt-dev
chen xu [Thu, 11 Apr 2019 09:16:19 +0000 (02:16 -0700)]
throw securityexception for notifyNetworkChange
throw exception instead of check permission and return.
Bug:
130329121
Test: Build
Change-Id: I9f0e60312ebd0baaf1538a6e658414211b17991b
Winson Chung [Thu, 11 Apr 2019 15:22:36 +0000 (15:22 +0000)]
Merge "Add state callbacks to launcher" into qt-dev
TreeHugger Robot [Thu, 11 Apr 2019 15:14:27 +0000 (15:14 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Thu, 11 Apr 2019 15:10:17 +0000 (15:10 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Thu, 11 Apr 2019 15:06:37 +0000 (15:06 +0000)]
Merge "Update comment per review feedback" into qt-dev
Ricky Wai [Thu, 11 Apr 2019 13:53:34 +0000 (06:53 -0700)]
Merge "Do not allow moveToFront() and moveTaskToFront() when app is in background" into qt-dev
am:
bbde1150c5
Change-Id: Id0555f82d152d24f282e8adb01c6248a9b515460
Chiachang Wang [Thu, 11 Apr 2019 13:34:13 +0000 (06:34 -0700)]
[automerger skipped] Merge "Add lifecycle tests to NetworkMonitorTest" into qt-dev
am:
7757b14c3b -s ours
am skip reason: change_id I1202626face33cc1e1ec02016b95da487b3335c8 with SHA1
cdef556adf is in history
Change-Id: Ie8af0987ed1576f3f54383305c1d9e94886bc840
Ricky Wai [Thu, 11 Apr 2019 13:33:04 +0000 (13:33 +0000)]
Merge "Do not allow moveToFront() and moveTaskToFront() when app is in background" into qt-dev
Jorim Jaggi [Thu, 11 Apr 2019 13:28:38 +0000 (06:28 -0700)]
Merge "Mark testEarliestAlarmSet as flaky" into qt-dev
am:
38ae4d1a92
Change-Id: I65328ed9599f59268507eca3e1ef19bbff8bd6e5
Chiachang Wang [Thu, 11 Apr 2019 13:15:40 +0000 (13:15 +0000)]
Merge "Add lifecycle tests to NetworkMonitorTest" into qt-dev
Todd Kennedy [Thu, 11 Apr 2019 13:14:15 +0000 (06:14 -0700)]
Update comment per review feedback
Treehugger was being a pain and I wanted to submit if it passsed.
It passed, so, need to adjust in a separate change.
Bug:
123919310
Test: None. This is a comment change only
Change-Id: Ib49cea7d814a7cb4566d663a2805ed56763454e8
Bill Yi [Thu, 11 Apr 2019 13:11:31 +0000 (06:11 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic2368d119ddd7e16c500dedefae454a50052edf0
Jorim Jaggi [Thu, 11 Apr 2019 13:09:53 +0000 (13:09 +0000)]
Merge "Mark testEarliestAlarmSet as flaky" into qt-dev
Jorim Jaggi [Thu, 11 Apr 2019 12:44:31 +0000 (14:44 +0200)]
Mark testEarliestAlarmSet as flaky
Blocks presubmits.
Test: n/a
Bug:
130313408
Change-Id: Ia716510866676c6aefeb2765bfef7a1a030cd791
Zimuzo [Fri, 5 Apr 2019 16:06:25 +0000 (17:06 +0100)]
Fixed PackageWatchdog health check state
1. Receiving List<PackageInfo>:
Since I29e2d619a5296716c29893ab3aa2f35f69bfb4d7, we now receive a
List of PackageInfo instead of Strings for packages supporting
explicit health checks. Now, we parse this List<PackageInfo> from
ExtServices instead of trying to parse List<String> and we use the
health check timeout in the PackageInfo as the health check expiry
deadline instead of using the total package expiry time.
2. Updating health check durations onSupportedPackages:
Before, we always updated the health check duration for a
package if the package is supported and the health check state is
not PASSED, this caused the health check duration for a package to
never reduce as long as we kept getting onSupportedPackages. Now, we
improved the readability of the state transitions onSupportedPackages.
We now correctly only update the health check duration for supported
packages in the INACTIVE state.
3. FAILED state:
Before we only had INACTIVE, ACTIVE and PASSED states. When a package
has failed the health check we could notify the observer multiple
times in quick succession and get into a bad internal state with
negative health check durations. Now we added check to ensure we
don't try to schedule with a Handler with a negative duration and we
defined a negative health check duration to be a new FAILED state if the
health check is not passed. This clearly defines the state transitions
as seen below:
+----------+ +---------+ +------+
| | | | | |
| INACTIVE +---->+ ACTIVE +--->+PASSED|
| | | | | |
+-----+----+ +----+----+ +------+
| |
| |
| |
| |
| +----v----+
| | |
+----------> FAILED |
| |
+---------+
4. Uptime state:
Everytime we pruned observers, we scheduled the next prune and stored
the current SystemClock#uptimeMillis. This allowed us determine how
much time had elapsed for the next prune. The uptime was not correclty
updated when starting to observe already observed packages. With the
following sequence of events:
-monitor package A for 1hr
-30mins elapsed
-monitor package A again for 1hr
A would expire 30mins from the last event instead of 1hr.
This was because the second time around, we
saved the new state to disk but did not reschedule so did not update
the uptime at last schedule, so 1hr from the first event, we would
prune packages with the original uptime and incorrectly expire A
earlier. Now we update all internal state, fixed this and added a test
for this case.
5. Readability
Improved method variable names, logging and comments.
Bug:
120598832
Test: Manual testing && atest PackageWatcdogTest
Change-Id: I1512d5938848ad26b668636405fe9b0db50d3a2e
Alison Cichowlas [Thu, 11 Apr 2019 12:43:27 +0000 (05:43 -0700)]
Merge "Merge caller targets and ranked targets." into qt-dev
am:
bf72ee109b
Change-Id: I9af303211fb020d29f70d2b58f7041b05b6bc294
Tony Huang [Thu, 11 Apr 2019 12:26:03 +0000 (05:26 -0700)]
Merge "Override actionModeCloseDrawable in Theme.DeviceDefault.DocumentsUI" into qt-dev
am:
fd47e681f0
Change-Id: I0daa35748e546309c0c21b4c12436820d6e871bd
Alison Cichowlas [Thu, 11 Apr 2019 12:24:22 +0000 (12:24 +0000)]
Merge "Merge caller targets and ranked targets." into qt-dev
TreeHugger Robot [Thu, 11 Apr 2019 12:13:21 +0000 (12:13 +0000)]
Merge "Override actionModeCloseDrawable in Theme.DeviceDefault.DocumentsUI" into qt-dev
Lorenzo Colitti [Wed, 10 Apr 2019 09:57:17 +0000 (02:57 -0700)]
Add lifecycle tests to NetworkMonitorTest
- Ensure that NetworkMonitor quits when notifyNetworkDisconnected
is called.
- Ensure that BroadcastReceivers are registered when a captive
portal is detected and unregistered when the network validates
or when NetworkMonitor quits.
Bug:
122164725
Test: atest FrameworksNetTests NetworkStackTests
Test: atest --generate-new-metrics 10 NetworkStackTests:com.android.server.connectivity.NetworkMonitorTest
Test: test fails if "Don't leak captive portal broadcast receivers." change reverted
Change-Id: I1202626face33cc1e1ec02016b95da487b3335c8
Merged-In: I1202626face33cc1e1ec02016b95da487b3335c8
(cherry picked from commit
bb41c8f7513cf1547fc1724c1c3343321f56c18e)
Po-Chien Hsueh [Thu, 11 Apr 2019 08:36:54 +0000 (16:36 +0800)]
Retry getting DynamicSystem service
DynamicSystemService might not be ready even sysprop init.svc.gsid
is "running". Move connect() into retry loop.
Bug:
130336119
Test: boot the device and check logcat
Change-Id: Iab5065bf139abcf6c19dcc3553f8a3ca1642e7b3
Junyu Lai [Thu, 11 Apr 2019 08:48:50 +0000 (01:48 -0700)]
[automerger skipped] Merge "Fix onBlockedStatusChanged does not work on multiple networks" into qt-dev
am:
c53df3a9cc -s ours
am skip reason: change_id Ifd18d1c6ad708c1dbc793f03d8241f572af50317 with SHA1
26b7664c43 is in history
Change-Id: I1a1cac47a948636d6dae934edb3fbf42327f5314
Mady Mellor [Thu, 11 Apr 2019 08:44:43 +0000 (01:44 -0700)]
Merge "Fix regression from ag/
6938053 where the pointer is in wrong place" into qt-dev
am:
9aae324a2a
Change-Id: I4dca2d4854bf8f73c7189b07349bd4d710049a09
Yohei Yukawa [Thu, 11 Apr 2019 08:38:26 +0000 (01:38 -0700)]
Add '-u <user id>' option to 'adb shell ime reset'
am:
2d4b343b69
Change-Id: Ie42bcc1030dff0f14de6291cf4f8659f80a42205
Yohei Yukawa [Thu, 11 Apr 2019 08:35:38 +0000 (01:35 -0700)]
Add '-u <user id>' option to 'adb shell ime set'
am:
099f80ce97
Change-Id: I89bc0ae21d2b82c8dbce804d4d8c39c4367ced12
Yohei Yukawa [Thu, 11 Apr 2019 08:29:56 +0000 (01:29 -0700)]
Add '-u <user id>' option to 'adb shell ime enable'
am:
e177170f64
Change-Id: Ib02eb637d06524a597cd7be314dff26ad6419875
Tony Huang [Wed, 10 Apr 2019 06:03:23 +0000 (14:03 +0800)]
Override actionModeCloseDrawable in Theme.DeviceDefault.DocumentsUI
Since RRO do not support to override theme which indicate specific
attr to reference private resource at Q, defined actionModeCloseDrawable
in Theme.DeviceDefault.DocumentsUI can ensure all Q devices apply the
reasonable design.
Fix:
130209354
Test: visual
Test: atest DocumentsUIGoogleTests
Change-Id: I7751aaa753e92a860dc20b873967631a4070595e
Tej Singh [Thu, 11 Apr 2019 08:13:55 +0000 (01:13 -0700)]
Merge "Fix puller callback with gauge/value metric" into qt-dev
am:
ce1acbc526
Change-Id: If3dc7c5bc1797e6a676ee659acff522b5ec1e6dc
Eran Messeri [Thu, 11 Apr 2019 07:53:53 +0000 (00:53 -0700)]
Merge "[automerger skipped] Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into oc-dev am:
07a485743a am:
30826bd658 am:
d89cac1562 -s ours am:
0f512b2eba -s ours
am:
db797218a4 -s ours
am skip reason: change_id I8ee3f876fcaffa63636645f0f59709cd147254ef with SHA1
5ab98de315 is in history
Change-Id: I6ec08071d911728655b742efa74834d002d15e1b
Sundong Ahn [Thu, 11 Apr 2019 07:38:30 +0000 (00:38 -0700)]
[automerger skipped] Merge "Add Vts test for xsd_config" into qt-dev
am:
b2514335e5 -s ours
am skip reason: change_id Ib73dcbe4f9c20e0a957be4325d5cfc2b27c64b67 with SHA1
75dec5cd75 is in history
Change-Id: I48512e9a486c4c13a8776c8bb3f3d15508390f51
Sundong Ahn [Thu, 11 Apr 2019 07:31:16 +0000 (00:31 -0700)]
[automerger skipped] Add Vts test for xsd_config
am:
75dec5cd75 -s ours
am skip reason: change_id Ib73dcbe4f9c20e0a957be4325d5cfc2b27c64b67 with SHA1
dc15dc8cc0 is in history
Change-Id: I54350afd5186f71f5f8fad7e1d074274fb5d198f
Remi NGUYEN VAN [Thu, 11 Apr 2019 07:24:48 +0000 (00:24 -0700)]
[automerger skipped] Merge "Crash the system server if network stack is lost" into qt-dev
am:
27ac06ea33 -s ours
am skip reason: change_id I64f366fc69b52f27d65461be50d81edc199bcb62 with SHA1
cec6a71e91 is in history
Change-Id: I8b67d4e507d0ec8703ec12147db8ac68a3805d17
Sundong Ahn [Thu, 11 Apr 2019 07:21:17 +0000 (00:21 -0700)]
[automerger skipped] Merge "Change to choice" into qt-dev
am:
d69eb2457a -s ours
am skip reason: change_id I72866da5b2a8ac37d725f5b604dae37a06f30162 with SHA1
560de69213 is in history
Change-Id: I0d5689016f0b46a0e7da3dba60da03cd6ddfbcaa
Julia Reynolds [Thu, 11 Apr 2019 07:17:47 +0000 (00:17 -0700)]
Merge "[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into oc-dev am:
2256fd4e11 am:
51fee974a9 am:
19ad060bf0 am:
9456d1e079
am:
45c0ce2efa
Change-Id: Ia9d750f498a4c3b2080c898f0c010610d62158ae
Julia Reynolds [Thu, 11 Apr 2019 07:09:58 +0000 (00:09 -0700)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into oc-dev am:
652a666500 am:
5d35ad7446 am:
03cddd8562 am:
00f5cf45c7
am:
37291c057a
Change-Id: If82cc159dc74b55c213a34ff283e22bf45a6feed
Junyu Lai [Thu, 11 Apr 2019 06:58:48 +0000 (06:58 +0000)]
Merge "Fix onBlockedStatusChanged does not work on multiple networks" into qt-dev
Pavel Grafov [Thu, 11 Apr 2019 06:57:29 +0000 (23:57 -0700)]
[automerger skipped] [automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e am:
55209aca88 am:
d5ce9a41b6 am:
20007cb46f am:
3ae9c5c63b -s ours am:
8a317effc2 -s ours am:
cbffcf9c24 -s ours
am:
dffb9c7068 -s ours
am skip reason: change_id I2fef9ab13614627c0f1bcca04759d0974fc6181a with SHA1
1b6301cf24 is in history
Change-Id: I3c320deca7240a508a3bf58db71265441cdeda12
Mady Mellor [Thu, 11 Apr 2019 06:57:25 +0000 (06:57 +0000)]
Merge "Fix regression from ag/
6938053 where the pointer is in wrong place" into qt-dev
Todd Kennedy [Thu, 11 Apr 2019 06:46:02 +0000 (23:46 -0700)]
Merge "Fix compressed stubs" into qt-dev
am:
6b1c8d6816
Change-Id: I24bb1cda428e2041a1cca6f8b87e7c865b9c03c4
Jack He [Thu, 11 Apr 2019 06:40:39 +0000 (23:40 -0700)]
Merge "Revert "Remove overlay logic from package manager and parser"" into qt-dev
am:
b73580d2fa
Change-Id: Id0c9df23459007a8063e1d508c500c5145a63170
Remi NGUYEN VAN [Thu, 11 Apr 2019 06:31:51 +0000 (23:31 -0700)]
[automerger skipped] Merge "Expose captive portal urls for configuration" into qt-dev
am:
e0603420f8 -s ours
am skip reason: change_id I54050b28bbfb93e0b7e509dbe0e987a0b902b7d9 with SHA1
8beec384fd is in history
Change-Id: I15a4acf4355e05833ed15bde3deb0db966f2a75a
Yohei Yukawa [Thu, 11 Apr 2019 06:23:25 +0000 (23:23 -0700)]
Add '-u <user id>' option to 'adb shell ime reset'
This is a preparation to add end-to-end CTS for per-profile IME mode.
In order to allow CTS tests to switch IME via shell command in
multi-user environment, this CL adds '-u <user id>' option to
adb shell ime reset
Bug:
122924287
Test: Manually tested as follows:
1. Build aosp_blueline-userdebug and flash it
2. make -j SoftKeyboard
3. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
4. adb shell ime enable com.example.android.softkeyboard/.SoftKeyboard
5. adb shell ime set com.example.android.softkeyboard/.SoftKeyboard
6. adb shell pm create-user test
7. adb shell am switch-user 10
8. adb shell ime list -s -u 0
-> com.android.inputmethod.latin/.LatinIME
com.example.android.softkeyboard/.SoftKeyboard
9. adb shell ime reset -u 0
-> Reset current and enabled IMEs for user #0
Selected: com.android.inputmethod.latin/.LatinIME
Enabled: com.android.inputmethod.latin/.LatinIME
10. adb shell ime list -s -u 0
-> com.android.inputmethod.latin/.LatinIME
Test: Manually tested as follows.
1. Build aosp_blueline-userdebug and flash it
2. adb shell pm create-user restricted_test
3. adb root
4. adb shell pm set-user-restriction --user 10 no_debugging_features 1
5. adb shell ime reset -u all
-> Reset current and enabled IMEs for user #0
Selected: com.android.inputmethod.latin/.LatinIME
Enabled: com.android.inputmethod.latin/.LatinIME
User #10 is restricted with DISALLOW_DEBUGGING_FEATURES
Change-Id: Ie330c6faa76f366b78c15c0161873a051a3d40e3
Yohei Yukawa [Thu, 11 Apr 2019 06:23:17 +0000 (23:23 -0700)]
Add '-u <user id>' option to 'adb shell ime set'
This is a preparation to add end-to-end CTS for per-profile IME mode.
In order to allow CTS tests to switch IME via shell command in
multi-user environment, this CL adds '-u <user id>' option to
adb shell ime set <ime id>
Another notable behavior change in this CL is that
adb shell ime set <ime id>
now gracefully fails with showing one-line error message when <ime id>
does not exist. Previously it failed with showing a stacktrace
because of unhandled IllegalArgumentException.
Bug:
122924287
Test: Manually tested as follows:
1. Build aosp_blueline-userdebug and flash it
2. make -j SoftKeyboard
3. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
4. adb shell pm create-user test
5. adb shell am switch-user 10
6. adb shell ime enable -u 0 com.example.android.softkeyboard/.SoftKeyboard
-> Input method com.example.android.softkeyboard/.SoftKeyboard: now enabled for user #0
7. adb shell ime set -u 0 com.example.android.softkeyboard/.SoftKeyboard
-> Input method com.example.android.softkeyboard/.SoftKeyboard selected for user #0
Test: Manually tested as follows.
1. Build aosp_blueline-userdebug and flash it
2. adb shell pm create-user restricted_test
3. adb root
4. adb shell pm set-user-restriction --user 10 no_debugging_features 1
5. adb shell ime set -u all com.android.inputmethod.latin/.LatinIME
-> Input method com.android.inputmethod.latin/.LatinIME: now disabled for user #0
User #10 is restricted with DISALLOW_DEBUGGING_FEATURES.
Change-Id: I397cf0fb418a395dcafc0ab0d8d4e553b0f2eaab
Po-Chien Hsueh [Thu, 11 Apr 2019 06:22:25 +0000 (23:22 -0700)]
Merge "stopSelf() if there is no installed system image" into qt-dev
am:
c7a2372ab6
Change-Id: Id98508a68107841c6befd2ab4c81f18a8953da74
Yohei Yukawa [Thu, 11 Apr 2019 06:20:51 +0000 (23:20 -0700)]
Add '-u <user id>' option to 'adb shell ime enable'
This is a preparation to add end-to-end CTS for per-profile IME mode.
In order to allow CTS tests to enable/disable IMEs via shell command
in multi-user environment, this CL adds '-u <user id>' option to
adb shell ime enable <ime id>
and
adb shell ime disable <ime id>
Note that '-u' option is already supposed in 'adb shell ime list' [1].
[1]: I192a0f5a1375170d17a4c08af94f23966dbaea8b
7f8ee4b9ddd31ad36a12c5278b27990dc76011cc
Bug:
122924287
Test: Manually tested as follows:
1. Build aosp_blueline-userdebug and flash it
2. make -j SoftKeyboard
3. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
4. adb shell pm create-user test
5. adb shell am switch-user 10
6. adb shell ime enable -u 0 com.example.android.softkeyboard/.SoftKeyboard
-> Input method com.example.android.softkeyboard/.SoftKeyboard: now enabled for user #0
7. adb shell ime disable -u 0 com.example.android.softkeyboard/.SoftKeyboard
-> Input method com.example.android.softkeyboard/.SoftKeyboard: now disabled for user #0
Test: Manually tested as follows.
1. Build aosp_blueline-userdebug and flash it
2. adb shell pm create-user test
3. adb shell pm create-user restricted_test
4. adb root
5. adb shell pm set-user-restriction --user 11 no_debugging_features 1
6. adb shell am switch-user 10
7. adb shell am switch-user 11
8. adb shell am switch-user 0
9. adb shell ime disable -u all com.android.inputmethod.latin/.LatinIME
-> Input method com.android.inputmethod.latin/.LatinIME: now disabled for user #0
Input method com.android.inputmethod.latin/.LatinIME: now disabled for user #10
User #11 is restricted with DISALLOW_DEBUGGING_FEATURES.
Change-Id: Ia0f873e4589a9fc3f549469e3d1d966640dc2df5
Ugo Yu [Thu, 11 Apr 2019 05:57:22 +0000 (22:57 -0700)]
Merge changes from topic "bt-metadata-api-v2-qt-dev" into qt-dev
am:
10093916cc
Change-Id: Ie27219720531d7c60afbfb3b726f6ab6c2052de0
Ugo Yu [Thu, 11 Apr 2019 05:49:51 +0000 (22:49 -0700)]
Refine Bluetooth Metadata API
am:
4741a8bd53
Change-Id: I7f668ded97429c76fa21788dec593fbb22e4fb99
TreeHugger Robot [Thu, 11 Apr 2019 05:40:33 +0000 (05:40 +0000)]
Merge "Fix puller callback with gauge/value metric" into qt-dev
Android Build Merger (Role) [Thu, 11 Apr 2019 05:37:50 +0000 (05:37 +0000)]
Merge "[automerger skipped] Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into oc-dev am:
07a485743a am:
30826bd658 am:
d89cac1562 -s ours am:
0f512b2eba -s ours am skip reason: change_id I8ee3f876fcaffa63636645f0f59709cd147254ef with SHA1
5ab98de315 is in history" into qt-dev
Suprabh Shukla [Thu, 11 Apr 2019 05:37:44 +0000 (22:37 -0700)]
Merge "Temporarily stop crashing on alarm limit" into qt-dev
am:
db8b76d501
Change-Id: I31a3058a12f18647c2818c06dedf1b110874c04f
Eran Messeri [Thu, 11 Apr 2019 05:37:23 +0000 (22:37 -0700)]
[automerger skipped] Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into oc-dev am:
07a485743a am:
30826bd658 am:
d89cac1562 -s ours
am:
0f512b2eba -s ours
am skip reason: change_id I8ee3f876fcaffa63636645f0f59709cd147254ef with SHA1
5ab98de315 is in history
Change-Id: I827ef6a6a400895a374946059424f4901201cf57
TreeHugger Robot [Thu, 11 Apr 2019 05:35:43 +0000 (05:35 +0000)]
Merge "Add Vts test for xsd_config" into qt-dev
TreeHugger Robot [Thu, 11 Apr 2019 05:34:24 +0000 (05:34 +0000)]
Merge "Crash the system server if network stack is lost" into qt-dev
TreeHugger Robot [Thu, 11 Apr 2019 05:33:41 +0000 (05:33 +0000)]
Merge "Change to choice" into qt-dev
Sunny Goyal [Thu, 11 Apr 2019 05:29:53 +0000 (22:29 -0700)]
Merge "Simplifying duplicate resource definition" into qt-dev
am:
065eda458c
Change-Id: I4e351407765fa0bed476ac4fe2f8d7327e7c109d
Julia Reynolds [Thu, 11 Apr 2019 05:25:23 +0000 (22:25 -0700)]
Merge "[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into oc-dev am:
2256fd4e11 am:
51fee974a9 am:
19ad060bf0
am:
9456d1e079
Change-Id: I4dc59e06e8744cd3cb8b457f0901fa474e1bf538
Riddle Hsu [Thu, 11 Apr 2019 05:24:50 +0000 (22:24 -0700)]
Ensure consistency of screenHeightDp for non-resizable activity
am:
61987bcaf5
Change-Id: I97527f8599b42ec31902c9825e1dc03721af699b
Yao Chen [Thu, 11 Apr 2019 05:22:37 +0000 (22:22 -0700)]
Merge "Add a condition timer to track the duration of condition being true." into qt-dev
am:
32fa3c237d
Change-Id: Iae054510fb5511290fc51c4b2bccd8f99ccc20e4
Julia Reynolds [Thu, 11 Apr 2019 05:17:52 +0000 (22:17 -0700)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into oc-dev am:
652a666500 am:
5d35ad7446 am:
03cddd8562
am:
00f5cf45c7
Change-Id: I5272a3c39f8e7d0b60368dcc35b398f455c5ae2c
Robert Snoeberger [Thu, 11 Apr 2019 05:17:31 +0000 (22:17 -0700)]
Merge "Drop Type clock face." into qt-dev
am:
fe6b8f696e
Change-Id: Id70eaae1e4701f5751606575811578ef8bf29d47
Anil Admal [Thu, 11 Apr 2019 05:12:28 +0000 (22:12 -0700)]
Merge "Cleanup SUPL network request parameters for requestRouteToHostAddress" into qt-dev
am:
4b8ea4aa3c
Change-Id: Ie70b5621a3d79db1b5333c7bcde10f8f16cda263
Kevin Chyn [Thu, 11 Apr 2019 05:07:14 +0000 (22:07 -0700)]
Merge "Check PackageManager before getting <Biometric>Manager" into qt-dev
am:
ed8438ac87
Change-Id: I912aca39c8f2b5d240c63450000e7260e5b354e1
Pavel Grafov [Thu, 11 Apr 2019 05:04:58 +0000 (22:04 -0700)]
[automerger skipped] [automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e am:
55209aca88 am:
d5ce9a41b6 am:
20007cb46f am:
3ae9c5c63b -s ours am:
8a317effc2 -s ours
am:
cbffcf9c24 -s ours
am skip reason: change_id I2fef9ab13614627c0f1bcca04759d0974fc6181a with SHA1
1b6301cf24 is in history
Change-Id: I5d0100f3e0b5a404836572a34ddcd685282407eb
Shawn Lin [Thu, 11 Apr 2019 05:01:28 +0000 (22:01 -0700)]
Merge "Add log_from_module annotation for docsui" into qt-dev
am:
675dab7776
Change-Id: I5f1e080443dda710b25828fd925acbfcc9f680e0
Lucas Dupin [Thu, 11 Apr 2019 04:56:20 +0000 (21:56 -0700)]
Merge "Improve dump format" into qt-dev
am:
691169c8fe
Change-Id: I3def8e9fc5ef3276548baf50bfd8041ada3c78ca
Lucas Dupin [Thu, 11 Apr 2019 04:51:21 +0000 (21:51 -0700)]
Merge "Show navbar on lock screen if gestural nav" into qt-dev
am:
e2fca4781f
Change-Id: I71e8347fd4b65233c52682aff940b405ae1154b2
Ying Zheng [Thu, 11 Apr 2019 04:46:16 +0000 (21:46 -0700)]
Merge "Flip default value of headless user 0 flag." into qt-dev
am:
a81892761b
Change-Id: I83f1addd0c9fcd6e5bef389ae267a23c63b5f7da
Lucas Dupin [Thu, 11 Apr 2019 04:41:18 +0000 (21:41 -0700)]
Merge "Make sure BiometricType is never null" into qt-dev
am:
81ee1fb3e6
Change-Id: I56c69017ce9b8f39f22743cfc2343b8a2118a051
TreeHugger Robot [Thu, 11 Apr 2019 04:31:22 +0000 (04:31 +0000)]
Merge "Fix compressed stubs" into qt-dev
TreeHugger Robot [Thu, 11 Apr 2019 04:12:23 +0000 (04:12 +0000)]
Merge "Revert "Remove overlay logic from package manager and parser"" into qt-dev
jiabin [Thu, 11 Apr 2019 03:55:35 +0000 (20:55 -0700)]
Merge "Rename mute haptic channel API." into qt-dev
am:
de2861cff9
Change-Id: Idfc8b71e2b611cb74bad08b3aa8b95ea79f291cf
Remi NGUYEN VAN [Wed, 10 Apr 2019 06:18:22 +0000 (23:18 -0700)]
Crash the system server if network stack is lost
Crash the system server if it cannot bind to the network stack, or if
the network stack crashes. This is better than keeping the system
running in a bad state where all networking would be broken.
Before the network stack was moved to a different process, the whole
system would go down when it encountered a crash.
Test: added crash in NetworkStack, verified system_server restart
Bug:
130028724
Merged-In: I64f366fc69b52f27d65461be50d81edc199bcb62
Merged-In: I034a62ec44ba1da32fd47c842a2bdf86f6ccf542
(cherry picked from commit
d44fc02248308c403e104461a64da058bb637253)
Change-Id: I989703c9dda62bd58df413ca8949f9a25187e062
Remi NGUYEN VAN [Thu, 11 Apr 2019 03:44:08 +0000 (03:44 +0000)]
Merge "Expose captive portal urls for configuration" into qt-dev
Tej Singh [Thu, 11 Apr 2019 02:25:03 +0000 (19:25 -0700)]
Fix puller callback with gauge/value metric
Allows gauge/value metrics to work with pulled atoms that were
registered after the config was received.
Test: gts
Bug:
130314103
Change-Id: I9cddd28efd464d8bb78da868d8c0d850ffb0235c
TreeHugger Robot [Thu, 11 Apr 2019 03:41:01 +0000 (03:41 +0000)]
Merge "stopSelf() if there is no installed system image" into qt-dev
TreeHugger Robot [Thu, 11 Apr 2019 03:37:58 +0000 (03:37 +0000)]
Merge changes from topic "bt-metadata-api-v2-qt-dev" into qt-dev
* changes:
Bluetooth metadata API changes in SettingsLib
Refine Bluetooth Metadata API