OSDN Git Service
Muhammad Qureshi [Wed, 3 Apr 2019 17:38:51 +0000 (17:38 +0000)]
Merge "Cancel Metric activations"
TreeHugger Robot [Wed, 3 Apr 2019 17:37:07 +0000 (17:37 +0000)]
Merge "Increase char limit for face_error_not_enrolled"
Annie Meng [Wed, 3 Apr 2019 17:18:34 +0000 (17:18 +0000)]
Merge "Dont sync keys using the unified challenge profile random credential"
Tyler Gunn [Wed, 3 Apr 2019 17:18:10 +0000 (17:18 +0000)]
Merge "Remove call identification APIs."
TreeHugger Robot [Wed, 3 Apr 2019 17:10:25 +0000 (17:10 +0000)]
Merge "Fix NPE in logActionClick"
Mady Mellor [Wed, 3 Apr 2019 17:08:09 +0000 (17:08 +0000)]
Merge "Enforce new bubble policy in NoMan"
TreeHugger Robot [Wed, 3 Apr 2019 17:06:29 +0000 (17:06 +0000)]
Merge "Add metadata and headers to incident reports."
Olivier Gaillard [Wed, 3 Apr 2019 17:06:07 +0000 (17:06 +0000)]
Merge "Change visibility of *WorkSourceUid APIs to public instead of @SystemApi."
TreeHugger Robot [Wed, 3 Apr 2019 17:03:21 +0000 (17:03 +0000)]
Merge "Change KernelCpuThreadReader frequency bucketing to work with >2 core clusters"
TreeHugger Robot [Wed, 3 Apr 2019 16:58:31 +0000 (16:58 +0000)]
Merge "Don't lock the profile after setting work challenge."
Josh Tsuji [Wed, 3 Apr 2019 16:46:15 +0000 (16:46 +0000)]
Merge "Disable a flaky test, will fix later."
William Hester [Wed, 3 Apr 2019 16:43:12 +0000 (16:43 +0000)]
Merge "Ensure that THM sets up even when system dies"
Yifan Hong [Wed, 3 Apr 2019 16:41:20 +0000 (16:41 +0000)]
Merge "libmedia2_jni: link to libcgrouprc"
Joshua Tsuji [Wed, 3 Apr 2019 16:37:26 +0000 (12:37 -0400)]
Disable a flaky test, will fix later.
Test: Disabling a test
Change-Id: Ifc76fc8fc66ee57ebf87eedcad0e2474a19674da
Android Build Merger (Role) [Wed, 3 Apr 2019 16:32:55 +0000 (16:32 +0000)]
Merge "Merge "Pass app's data dir to ART" am:
16749ac83e am:
33ed677361 am:
6277c39b0e"
TreeHugger Robot [Wed, 3 Apr 2019 16:32:48 +0000 (16:32 +0000)]
Merge "Tweak bar chart measurement."
David Brazdil [Wed, 3 Apr 2019 16:30:44 +0000 (09:30 -0700)]
Merge "Pass app's data dir to ART" am:
16749ac83e am:
33ed677361
am:
6277c39b0e
Change-Id: Iec85a2630e364e66e45e42f2cbb6a26008c0ab4a
TreeHugger Robot [Wed, 3 Apr 2019 16:30:08 +0000 (16:30 +0000)]
Merge "Support content description with app name"
Makoto Onuki [Wed, 3 Apr 2019 16:19:28 +0000 (16:19 +0000)]
Merge "Improve CursorWindow failure message"
David Brazdil [Wed, 3 Apr 2019 16:13:31 +0000 (09:13 -0700)]
Merge "Pass app's data dir to ART" am:
16749ac83e
am:
33ed677361
Change-Id: I9a7c617f13dadc91b735837d1778e3d526be8520
Michael Wright [Wed, 3 Apr 2019 16:04:03 +0000 (16:04 +0000)]
Merge "Expose input region monitoring to system components."
TreeHugger Robot [Wed, 3 Apr 2019 16:03:45 +0000 (16:03 +0000)]
Merge "Update the format of the am_compact event log message."
Makoto Onuki [Tue, 2 Apr 2019 21:05:05 +0000 (14:05 -0700)]
Improve CursorWindow failure message
Bug:
129139241
Bug:
129721058
Test: atest CursorWindowTest
Change-Id: Iac1c5ec6f999dadd638fc5ab47c69d13f60ea467
Govinda Wasserman [Wed, 3 Apr 2019 15:59:10 +0000 (15:59 +0000)]
Merge "Adds the ability for SysUI to request QSB alpha changes."
Andrew Solovay [Thu, 28 Mar 2019 22:56:45 +0000 (15:56 -0700)]
docs: Javadoc cleanup
There were a number of Javadoc style problems in the
WifiNetworkSuggestion.Builder.build() docs, which caused some formatting
problems.
One specific problem worth noting: A {{ causes trouble at publish time,
because it looks like the start of a Django directive. But escaping the
{ -- e.g. { -- doesn't work, because the Javadoc compiler helpfully
escapes the *ampersand*, so the HTML output is "&#123", which
renders on the page as "{" instead of "{". So putting a space
between the two braces seems like the simplest solution.
No code changes here, just Javadoc comment fixes.
Tested by building the docs and staging to:
http://go/dac-stage/reference/android/net/wifi/WifiNetworkSuggestion.Builder#build
Screenshots (in case the stage gets overwritten):
https://screenshot.googleplex.com/o4p7efFGCbJ.png (1)
https://screenshot.googleplex.com/nkhEqU54LNb.png (2)
Bug:
128536865
Test: make ds-docs (then build & stage)
Change-Id: Ie04bc4dc517443a6899aba989beeb38b9299826e
TreeHugger Robot [Wed, 3 Apr 2019 15:53:32 +0000 (15:53 +0000)]
Merge "Remove user switcher when multiple users is disabled"
TreeHugger Robot [Wed, 3 Apr 2019 15:41:33 +0000 (15:41 +0000)]
Merge "Don't announce changes in zen dialog"
Ilya Matyukhin [Wed, 3 Apr 2019 15:38:36 +0000 (08:38 -0700)]
Increase char limit for face_error_not_enrolled
Test: build
Fixes:
129708679
Change-Id: Id7ddb5a767dc33d701c2d8ba97672b41c93dccff
David Brazdil [Wed, 3 Apr 2019 15:35:34 +0000 (08:35 -0700)]
Merge "Pass app's data dir to ART"
am:
16749ac83e
Change-Id: I170cbff78d12ccc418cb440820a584f141f28433
TreeHugger Robot [Wed, 3 Apr 2019 15:32:42 +0000 (15:32 +0000)]
Merge "Tidy up some Javadoc."
TreeHugger Robot [Wed, 3 Apr 2019 15:28:12 +0000 (15:28 +0000)]
Merge "Set active stream when progerss changed by user"
Misha Wagner [Wed, 3 Apr 2019 11:37:17 +0000 (12:37 +0100)]
Change KernelCpuThreadReader frequency bucketing to work with >2 core clusters
Change-Id: I470dc055b9b1eb07913280fc269fbdadb259b4db
Test: atest KernelCpuThreadReaderTest
Eric Laurent [Wed, 3 Apr 2019 15:23:16 +0000 (15:23 +0000)]
Merge "Revert "Mute haptic channels by default.""
Chandan Nath [Wed, 3 Apr 2019 15:22:11 +0000 (15:22 +0000)]
Merge "[Multi-user] Clean up user state stored in the system user directory when user is removed."
David Brazdil [Wed, 3 Apr 2019 15:21:45 +0000 (15:21 +0000)]
Merge "Pass app's data dir to ART"
TreeHugger Robot [Wed, 3 Apr 2019 15:13:32 +0000 (15:13 +0000)]
Merge "Use a confirmedTap listener to guarantee a click. This eliminates the overlapping component listener bug from the caption service."
Mady Mellor [Wed, 3 Apr 2019 14:56:42 +0000 (14:56 +0000)]
Merge "Use FLAG_BUBBLE rather than setting the value ourselves"
Todd Kennedy [Wed, 3 Apr 2019 14:47:01 +0000 (14:47 +0000)]
Merge "OMS: ignore instant apps"
TreeHugger Robot [Wed, 3 Apr 2019 14:40:58 +0000 (14:40 +0000)]
Merge "Change theme setting to JSONObject format."
Tony Mak [Wed, 27 Mar 2019 17:03:45 +0000 (17:03 +0000)]
Fix NPE in logActionClick
Problem:
The issue could happen when clicking on the archive button on the
notification from Gmail repeatedly and quickly. Tapping the Archive
button will change the notification layout to something custom
with a single UNDO button. The bug happens when the notification object
is already updated, while logActionClick of the old action button is
still running.
Proposed solution:
1. Add sanity check to avoid NPE, array index out of bounds.
2. To ensure that the action object is the one we want, use PendingIntent in
Notification.Action as a token.
logActionClick is just used as logging, and the problem seems only happen
in repetitive clicks, so just bailing out should be fine.
Test: Have a Gmail notification, taps archive button repeatedly.
Observe no crash.
Test: Ensure that log is sent in normal cases by checking logcat.
FIXES:
128804769
Change-Id: Ic04fd9288cba5253179bf1f478a7454e44f31703
Narayan Kamath [Wed, 3 Apr 2019 14:10:22 +0000 (14:10 +0000)]
Merge "CastTile: Better handling of multiple active devices."
TreeHugger Robot [Wed, 3 Apr 2019 14:07:39 +0000 (14:07 +0000)]
Merge "Tell the app that a smart reply was used even when it has been edited."
Misha Wagner [Wed, 3 Apr 2019 13:55:30 +0000 (13:55 +0000)]
Merge "Add more tests to KernelCpuThreadReaderDiffTest"
Gustav Sennton [Tue, 2 Apr 2019 14:10:00 +0000 (15:10 +0100)]
Tell the app that a smart reply was used even when it has been edited.
The existing API RemoteInput.Source covers two scenarios for responding
to message notifications:
1. A user uses the 'reply' button and enters a response freely.
2. A user clicks a smart reply which is used as the response.
Before this CL the platform would notify the app of scenario nr. 1 in
the case where we use tap-to-edit smart replies (replies that can be
edited before being sent). With this CL we instead log scenario nr. 2
(since a smart reply was clicked).
Bug:
123407240
Test: use a test-app to ensure that a response created using smart
replies + tap-to-edit logs the correct @Source.
Change-Id: I3dc8169a3c440af106c4f244b72ddf7c9e450203
Annie Meng [Fri, 29 Mar 2019 17:43:35 +0000 (17:43 +0000)]
Dont sync keys using the unified challenge profile random credential
When the work profile has a tied screen lock to its parent, its lock
credentials are set to a random password. This CL adds logic to prevent
syncing keys with this random credential.
On set/update lock:
- If creating the work profile or going from separate -> unified lock
screen: don't sync keys (random password case)
- If going from unified -> separate lock screen: sync keys
- If removing the parent lock: invalidate unified profile keys
On unlock:
- If unlocking a work profile with a unified lock: don't sync keys
(random password case).
- If unlocking a work profile with a separate lock: sync keys
- If unlocking a parent profile that has work profiles with a unified
lock: sync keys for the work profiles.
Design: https://docs.google.com/document/d/1y6LXcf-Rk3TMG-Ka4pJ5fpinDaK4fnlCyGi3kuGWWNg/edit?usp=sharing
Bug:
128834006
Test: 1) atest frameworks/base/services/tests/servicestests/src/com/android/server/locksettings/
2) Manual testing of the following cases by verifying key sync on the
backup device and being able to unencrypt the backup set on the restore
device:
a) Work profile unified lock screen: all 3 types (pin/password/pattern).
b) Changing parent lock screen in the unified case -> updates keys for
profile.
c) Unified lock screen -> separate lock screen: updates keys.
d) Separate lock screen and change credentials: updates keys.
e) Separate lock screen -> unified lock screen: does not update keys
with random password.
f) Unified lock screen -> remove lock screen: invalidates keys.
Change-Id: Ie2249f4c32fd6c48aae7f791e2d1e353b4ef9939
Olivier Gaillard [Wed, 3 Apr 2019 10:32:12 +0000 (11:32 +0100)]
Change visibility of *WorkSourceUid APIs to public instead of @SystemApi.
Bug:
127465468
Test: atest BinderWorkSourceTest
Change-Id: Ib5743219ed44b893a64825d3d8c66e2f20b4197f
Jorim Jaggi [Wed, 3 Apr 2019 13:16:43 +0000 (13:16 +0000)]
Merge "Use mPidMap instead of mProcessNames to get process with pid info"
Tony Mak [Mon, 1 Apr 2019 19:02:29 +0000 (20:02 +0100)]
Support content description with app name
The logic is like:
1. If content description string with app name placeholder is available,
and we also have a app name, then we will use this string.
2. Otherwise, fallback to content description string without app
name placeholder.
Test: atest frameworks/base/core/tests/coretests/src/android/view/textclassifier/
Test: Actually see the content description with app name is formatted
properly
BUG:
128541828
Change-Id: Iee1dc8d4a429d759d9ab3f4b84dc1ad13b698cdb
Amin Shaikh [Tue, 2 Apr 2019 22:07:40 +0000 (18:07 -0400)]
Change theme setting to JSONObject format.
Add JSON_OBJECT_VALIDATOR to Settings and add unit tests.
Fixes:
129543539
Test: atest coretests
Change-Id: I4fa7a1357d442c1fa04a7eee815d5c3a48cc5115
Muhammad Qureshi [Thu, 28 Mar 2019 19:38:21 +0000 (12:38 -0700)]
Cancel Metric activations
Cancel Metric activations triggered by atom matchers
Bug:
128218061
Test: statsd_test
Test: statsd_localdrive
Change-Id: I90a705d74725c2aa04025e18e1fa77ec4fefc522
Pavel Grafov [Wed, 3 Apr 2019 12:58:58 +0000 (13:58 +0100)]
Don't lock the profile after setting work challenge.
In TrustManager user state defaults to "locked", so previously
the profile would become locked after work challenge is enabled.
Test: manual
Bug:
121256032
Change-Id: Ic0f5b075b85ca66c28d51830b47ed015c10da45c
Ecco Park [Wed, 3 Apr 2019 12:56:05 +0000 (12:56 +0000)]
Merge "carrier-config: define imsi_eap_identity_sequence_int key"
Michael Wright [Thu, 14 Feb 2019 12:33:46 +0000 (12:33 +0000)]
Expose input region monitoring to system components.
This is to allow SysUI to detect system-wide gestures.
Test: manual
Bug:
123748692
Change-Id: Ic1e2cd6afea219d0e20b29e7150c9a42b75c7a67
Chandan Nath [Fri, 29 Mar 2019 13:18:35 +0000 (13:18 +0000)]
[Multi-user] Clean up user state stored in the system user directory
when user is removed.
For non system users, backup state is stored in both the user's own dir and the system dir.
When the user is removed, the user's own dir gets removed by the OS. This code change ensures
that the part of the user backup state which is in the system dir also gets removed.
Bug:
127650374
Test: atest -v CtsBackupHostTestCases:android.cts.backup.MultiUserBackupStateTest
Change-Id: I4ea252e8e6da608e36ec3ac335666923d88a8748
David Brazdil [Wed, 3 Apr 2019 12:00:55 +0000 (13:00 +0100)]
Pass app's data dir to ART
Inform ART about the location of the app's data directory when setting
up the process. This is part of an optimization that has ART cache
verification data into that directory.
Test: compiles, boots
Bug:
72131483
Change-Id: Ic80526b6ee383733eb5860e66f6c608109d838fb
Narayan Kamath [Thu, 21 Mar 2019 18:09:38 +0000 (18:09 +0000)]
CastTile: Better handling of multiple active devices.
With the new MediaProjection based flow for cast, we will have
a connected MediaRoute active at the same time as a MediaProjection
session. In order to deal with them correctly, we need to assume
in a few places that we have more than one active CastDevice. We
also consider all devices that are connected, regardless of whether
the given route is selected or not.
Test: Manual
Test: atest CastControllerImplTest
Test: atest SystemUITests
Bug:
128515798
Change-Id: Ie46798633f69c347ee32e0799d6cb23576122dd9
Mathew Inwood [Wed, 3 Apr 2019 11:52:23 +0000 (11:52 +0000)]
Merge "Greylist IActivityTaskManagerSingleton."
lucaslin [Wed, 3 Apr 2019 11:35:21 +0000 (04:35 -0700)]
Merge "Fix NetworkMonitor won't do private dns resolution" am:
c895b818e0 am:
aecea736d2
am:
7d0a216e79
Change-Id: I2785e0aedd229aba6c1d8e8df09ee5c7a209b74c
lucaslin [Wed, 3 Apr 2019 11:25:18 +0000 (04:25 -0700)]
Merge "Fix NetworkMonitor won't do private dns resolution" am:
c895b818e0
am:
aecea736d2
Change-Id: I5ec0cb096f2704e21e0c0f296d5cf81ab8808627
lucaslin [Wed, 3 Apr 2019 11:13:48 +0000 (04:13 -0700)]
Merge "Fix NetworkMonitor won't do private dns resolution"
am:
c895b818e0
Change-Id: I7c7a573bef77ba952219e6f6f56ab11f0211e0a7
Mark Chien [Wed, 3 Apr 2019 10:54:42 +0000 (03:54 -0700)]
Merge "Some cleanups for Tethering" am:
31b33b6f41 am:
5dff3c98c5
am:
9d4a2a27e6
Change-Id: I0f5c8f33f13dfa2366992a2b2e0ada7667b90e2f
Treehugger Robot [Wed, 3 Apr 2019 10:50:09 +0000 (10:50 +0000)]
Merge "Fix NetworkMonitor won't do private dns resolution"
Misha Wagner [Wed, 3 Apr 2019 10:13:17 +0000 (11:13 +0100)]
Add more tests to KernelCpuThreadReaderDiffTest
Change-Id: I2fd69de9fded626d1210443bb63c4be251dd2658
Test: atest KernelCpuThreadReaderDiffTest
Mark Chien [Wed, 3 Apr 2019 10:45:05 +0000 (03:45 -0700)]
Merge "Some cleanups for Tethering" am:
31b33b6f41
am:
5dff3c98c5
Change-Id: I0e00187f9a5eee9e55f961ce0458c9b91af19fb7
Mark Chien [Wed, 3 Apr 2019 10:35:42 +0000 (03:35 -0700)]
Merge "Some cleanups for Tethering"
am:
31b33b6f41
Change-Id: Ifb60c76855a2bea5a1cccf26034e6c582ad16021
Alex Kershaw [Tue, 2 Apr 2019 12:45:49 +0000 (13:45 +0100)]
Tidy up some Javadoc.
Tidy up InstallSystemUpdateCallback#UPDATE_ERROR_UPDATE_FILE_INVALID
javadoc.
Test: Javadoc change only
Change-Id: I114c60ec330c1cea96a187f727570373b4e7f3bc
Mark Chien [Wed, 3 Apr 2019 10:16:25 +0000 (10:16 +0000)]
Merge "Some cleanups for Tethering"
TreeHugger Robot [Wed, 3 Apr 2019 09:54:20 +0000 (09:54 +0000)]
Merge "Use Volume Group core callback in volume preference rather than intent"
Nicolas Geoffray [Wed, 3 Apr 2019 09:50:35 +0000 (02:50 -0700)]
Merge "Remove support for dexopting shared libraries." am:
75a76da717 am:
bd0b7295a6
am:
f51cadfad5
Change-Id: I0270103a45df5205b07df8f8188870dc8e6f84b7
Nicolas Geoffray [Wed, 3 Apr 2019 09:29:05 +0000 (02:29 -0700)]
Merge "Remove support for dexopting shared libraries." am:
75a76da717
am:
bd0b7295a6
Change-Id: I3ce34a72359aa8fa53066311d37caabdd7b9717f
Remi NGUYEN VAN [Wed, 3 Apr 2019 09:28:11 +0000 (02:28 -0700)]
Merge "Fix API in CaptivePortal, StaticIpConfiguration" am:
0470353c2e am:
77daae9b3d
am:
e86dfa92fe
Change-Id: Icda65fe4a009a754b6a1a763d402820652d55391
Chenbo Feng [Wed, 3 Apr 2019 09:19:30 +0000 (02:19 -0700)]
Merge "Add tests for PermissionMonitor" am:
a84cdf4fc6 am:
b9ee567881
am:
18758e9f90
Change-Id: Ifcb29bfded1b1675231c397ed886506a70267279
Nicolas Geoffray [Wed, 3 Apr 2019 09:12:43 +0000 (02:12 -0700)]
Merge "Remove support for dexopting shared libraries."
am:
75a76da717
Change-Id: I2b77a9abfe953c0b2f3e1889a2f95ac78b7a8219
Remi NGUYEN VAN [Wed, 3 Apr 2019 09:12:22 +0000 (02:12 -0700)]
Merge "Fix API in CaptivePortal, StaticIpConfiguration" am:
0470353c2e
am:
77daae9b3d
Change-Id: I82eee20855710de2b4fb541dd5e2b887140ed364
lucaslin [Wed, 3 Apr 2019 09:09:28 +0000 (17:09 +0800)]
Fix NetworkMonitor won't do private dns resolution
NetworkMonitor cannot do the private dns resolution due to lack
"mNetworkCapabilities". ConnectivityService will call
NetworkStackService#notifyPrivateDnsChanged() before doing
network validation. After NetworkMonitor received
CMD_PRIVATE_DNS_SETTINGS_CHANGED, it will call
isValidationRequired to check if the validation is required.
But mNetworkCapabilities didn't be set, so the
mPrivateDnsProviderHostname will be set to empty and make
EvaluatingPrivateDnsState doesn't do private dns resolution.
Bug:
129375892
Test: 1. Build pass
2. atest FrameworksNetTests
3. atest NetworkStackTests
Change-Id: I637212fb4746bb2e9a2f4a4457fd36c4c2701149
Chenbo Feng [Wed, 3 Apr 2019 09:05:07 +0000 (02:05 -0700)]
Merge "Add tests for PermissionMonitor" am:
a84cdf4fc6
am:
b9ee567881
Change-Id: I9be22991bd590a7aee4d0a4b2908e0023870d0b6
Mathew Inwood [Wed, 3 Apr 2019 08:49:04 +0000 (09:49 +0100)]
Greylist IActivityTaskManagerSingleton.
This is needed by Tinker, a hotfix framework commonly used in China so
it can continue working in Q.
Bug:
129726065
Test: m
Change-Id: Ie559b1bd9ad256de789e387c3f2b182bd761d23f
tmfang [Wed, 3 Apr 2019 08:32:18 +0000 (16:32 +0800)]
Tweak bar chart measurement.
Test: visual
Fixes:
129480652
Fixes:
129481095
Change-Id: Ie08a31c487477aeaa40e06b8df9cb7571dd5d15f
Nicolas Geoffray [Wed, 3 Apr 2019 08:22:35 +0000 (08:22 +0000)]
Merge "Remove support for dexopting shared libraries."
Nicolas Geoffray [Mon, 1 Apr 2019 09:54:53 +0000 (10:54 +0100)]
Remove support for dexopting shared libraries.
The CL landed after feature complete, and has shown it can cause related issues,
not easy to deal with (eg b/
128529256 or b/
128912573).
The libs are expected to be preopted (as in P).
Partial revert of
653356f114fa798ee0cc3d5d5ac4ccd0ab4783de.
Test: BackgroundDexOptServiceIntegrationTests
Test: DexoptUtilsTest
Bug:
119800099
Change-Id: I3570fbc0e4f7079da3315691d676452b17e516a7
Remi NGUYEN VAN [Wed, 3 Apr 2019 08:21:38 +0000 (01:21 -0700)]
Merge "Fix API in CaptivePortal, StaticIpConfiguration"
am:
0470353c2e
Change-Id: Ia36ba5946e8dc956c5c71cbebe7dc02658fdb7a0
Narayan Kamath [Wed, 3 Apr 2019 08:14:14 +0000 (08:14 +0000)]
Merge "MediaProjectionManagerService: Exempt privileged apps from the f/g service requirement."
Chenbo Feng [Wed, 3 Apr 2019 08:10:07 +0000 (01:10 -0700)]
Merge "Add tests for PermissionMonitor"
am:
a84cdf4fc6
Change-Id: I2079c4ce13aae962c1d907009edc107e861bb3b5
Richard Uhler [Wed, 3 Apr 2019 08:05:02 +0000 (08:05 +0000)]
Merge "Use UserHandle.SYSTEM for ENABLE_ROLLBACK broadcast."
Po-Chien Hsueh [Wed, 3 Apr 2019 07:55:55 +0000 (07:55 +0000)]
Merge changes from topic "dyn_system_ff"
* changes:
Use setEnable() when there is an installed image
Use gsid.isGsiEnabled to refine DynamicSystemService
Use FeatureFlagPersistent to guard DynamicSystem
Make feature flag settings_dynamic_system persistent
Po-Chien Hsueh [Mon, 1 Apr 2019 08:51:47 +0000 (16:51 +0800)]
Use setEnable() when there is an installed image
We can now use setEnable() to tell GsiService that we would like
run in DynamicSystem on the next restart, if there is a system
image installed.
Bug:
124613126
Test: Tap the button and setEnabe() is invoked.
Change-Id: I74312af0c87548981ecb4e1ac9a1f3814304a4d5
Howard Chen [Fri, 29 Mar 2019 08:38:39 +0000 (16:38 +0800)]
Use gsid.isGsiEnabled to refine DynamicSystemService
* Add isEnabled
* Replace toggle with setEnable
Test: Compile passed
Bug:
125079548
Change-Id: I4931e6469388ea05194ba44ccb994f32c08ad40d
TreeHugger Robot [Wed, 3 Apr 2019 06:59:33 +0000 (06:59 +0000)]
Merge "zygote: initialize selinux app contexts before fork()"
Remi NGUYEN VAN [Wed, 3 Apr 2019 06:51:35 +0000 (06:51 +0000)]
Merge "Fix API in CaptivePortal, StaticIpConfiguration"
Treehugger Robot [Wed, 3 Apr 2019 06:12:12 +0000 (06:12 +0000)]
Merge "Add tests for PermissionMonitor"
markchien [Wed, 3 Apr 2019 02:43:09 +0000 (10:43 +0800)]
Some cleanups for Tethering
Bug:
126481523
Test: -build, flash, boot
-FrameworksNetTests
Change-Id: I904646efa87eb5434124c7828aca4ab09c5dc38e
Amith Yamasani [Wed, 3 Apr 2019 05:50:28 +0000 (05:50 +0000)]
Merge "Avoid elevating apps to high proc states on binding"
Jack Yu [Wed, 3 Apr 2019 05:27:01 +0000 (22:27 -0700)]
[automerger skipped] Merge changes from topic "am-
ee7381fd1a8845c99ba642b88f8db9d4" into stage-aosp-master am:
f2b4fcbacc -s ours
am:
a4d0bd441c -s ours
am skip reason: change_id Ib152f97711441fded998a36528ef007f9e28ccbf with SHA1
05a6543248 is in history
Change-Id: I8521ced6cb0c58f9f40eaec10dd4c194578a6a14
Jack Yu [Wed, 3 Apr 2019 05:12:33 +0000 (22:12 -0700)]
[automerger skipped] Merge changes from topic "am-
77824143cfe54e8ebd083716dd4fb16f" into stage-aosp-master am:
259ea052e8
am:
71757ccdb8 -s ours
am skip reason: change_id Ib152f97711441fded998a36528ef007f9e28ccbf with SHA1
05a6543248 is in history
Change-Id: I60381dea904297814f05ac3bd717f5b22c0b5368
Android Build Merger (Role) [Wed, 3 Apr 2019 04:57:48 +0000 (04:57 +0000)]
Merge "Merge "Merge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am:
3db9cfe660" into stage-aosp-master am:
78d17025e8" into pi-dev-plus-aosp am:
da912fb40b"
Paul Hu [Wed, 3 Apr 2019 04:57:11 +0000 (21:57 -0700)]
Merge "Merge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am:
3db9cfe660" into stage-aosp-master am:
78d17025e8" into pi-dev-plus-aosp
am:
da912fb40b
Change-Id: Ic2288afe4b4b077cba263e51f6308c34332b5eb1
Lucas Dupin [Wed, 3 Apr 2019 04:45:20 +0000 (04:45 +0000)]
Merge "Dismiss bouncer if auth happens during gesture"
Paul Hu [Wed, 3 Apr 2019 04:37:53 +0000 (21:37 -0700)]
Merge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am:
3db9cfe660 am:
2d20cd2378" into pi-dev-plus-aosp
am:
78f8fb79b5
Change-Id: Ie64e6636de76cb7e92b4bc33451d95437c179350
Jack Yu [Wed, 3 Apr 2019 04:31:11 +0000 (21:31 -0700)]
[automerger skipped] Merge changes from topic "am-
ee7381fd1a8845c99ba642b88f8db9d4" into stage-aosp-master
am:
f2b4fcbacc -s ours
am skip reason: change_id Ib152f97711441fded998a36528ef007f9e28ccbf with SHA1
27ff407104 is in history
Change-Id: I91228bb25d5d27440dbb8fe6297dfc91ac83bec5
TreeHugger Robot [Wed, 3 Apr 2019 04:27:29 +0000 (04:27 +0000)]
Merge "Bluetooth: Log class of device"