OSDN Git Service
TreeHugger Robot [Mon, 28 Jan 2019 10:10:33 +0000 (10:10 +0000)]
Merge "Notify SystemUI when ActivityDisplay is ready"
Remi NGUYEN VAN [Mon, 28 Jan 2019 09:47:49 +0000 (01:47 -0800)]
[automerger skipped] Merge "Move NetworkUtils used by NetworkStack" am:
b8bbc48dee am:
4c5b40e084
am:
9a77141364 -s ours
am skip reason: change_id Ie20dcee375b377236004a7689890729493aca857 with SHA1
77dd54d3d4 is in history
Change-Id: I5ea53ddf91c48d0700fe37318647b1e1fa26de23
Remi NGUYEN VAN [Mon, 28 Jan 2019 09:40:53 +0000 (01:40 -0800)]
Merge "Add NetworkObserverRegistry to NetworkStack" am:
375b3c075d am:
9a4810415c
am:
ecac3d1bc0
Change-Id: I63c258d07eccb61889bcb37b3a8819e80a42c692
Remi NGUYEN VAN [Mon, 28 Jan 2019 09:30:17 +0000 (01:30 -0800)]
Merge "Move NetworkUtils used by NetworkStack" am:
b8bbc48dee
am:
4c5b40e084
Change-Id: I0d6a40c79e92d1de18c41cc50b72fbe33db13bdc
Remi NGUYEN VAN [Mon, 28 Jan 2019 09:28:38 +0000 (01:28 -0800)]
Merge "Add NetworkStack tests to postsubmit" am:
f4fb1b5251 am:
4a19a149db
am:
04a764d873
Change-Id: I23481797072588084bb84366d23fbe135676b7a4
Remi NGUYEN VAN [Mon, 28 Jan 2019 09:22:33 +0000 (01:22 -0800)]
Merge "Add NetworkObserverRegistry to NetworkStack" am:
375b3c075d
am:
9a4810415c
Change-Id: Ia5a7a128dc3bb28b5aad183fcd9a339036a5834b
Remi NGUYEN VAN [Mon, 28 Jan 2019 09:21:01 +0000 (01:21 -0800)]
Merge "Move NetworkUtils used by NetworkStack"
am:
b8bbc48dee
Change-Id: Ib83c3cb8ced0d226bd57375cd4600665d72fd962
Remi NGUYEN VAN [Mon, 28 Jan 2019 09:17:19 +0000 (01:17 -0800)]
Merge "Add NetworkStack tests to postsubmit" am:
f4fb1b5251
am:
4a19a149db
Change-Id: I544dc328b01137abfb001c0529a45843fd37b0f1
Remi NGUYEN VAN [Mon, 28 Jan 2019 09:10:44 +0000 (01:10 -0800)]
Merge "Add NetworkObserverRegistry to NetworkStack"
am:
375b3c075d
Change-Id: Ife53135ab98c56a276ede9c7bbe7c345484c5e55
Remi NGUYEN VAN [Mon, 28 Jan 2019 09:06:51 +0000 (01:06 -0800)]
Merge "Add NetworkStack tests to postsubmit"
am:
f4fb1b5251
Change-Id: I50ff0bb440318d3bb9ac8304868b5f3f58a10fff
Remi NGUYEN VAN [Mon, 28 Jan 2019 09:06:20 +0000 (09:06 +0000)]
Merge "Move NetworkUtils used by NetworkStack"
Rhed Jao [Mon, 28 Jan 2019 09:00:31 +0000 (09:00 +0000)]
Merge "Update accessibility timeout settings to proto."
Remi NGUYEN VAN [Mon, 28 Jan 2019 08:59:28 +0000 (00:59 -0800)]
Merge "Add INetd to SystemServiceRegistry" am:
e3f18bd77c am:
9268c0be32
am:
50c95ba67c
Change-Id: I10cbfc198a0713dc53bfca611c082bbb387c1194
Remi NGUYEN VAN [Mon, 28 Jan 2019 08:54:06 +0000 (08:54 +0000)]
Merge "Add NetworkObserverRegistry to NetworkStack"
Remi NGUYEN VAN [Mon, 28 Jan 2019 08:53:13 +0000 (08:53 +0000)]
Merge "Add NetworkStack tests to postsubmit"
Remi NGUYEN VAN [Mon, 28 Jan 2019 08:47:45 +0000 (00:47 -0800)]
Merge "Add INetd to SystemServiceRegistry" am:
e3f18bd77c
am:
9268c0be32
Change-Id: I92cd23a587ab0f7df2db92918011a9a488c31668
Remi NGUYEN VAN [Mon, 28 Jan 2019 08:44:06 +0000 (00:44 -0800)]
[automerger skipped] Merge "Add NetworkStack networking deps to SystemApi" am:
9188b49259 am:
bc7a8f14f4
am:
f6a3b910bb -s ours
am skip reason: change_id Id59dc06fb85e4ac88098f56b621ec880610759ce with SHA1
ca1820bf2f is in history
Change-Id: I8e2ed91ef75e3a2f855b2b3549c0db5e1511ca5e
Remi NGUYEN VAN [Mon, 28 Jan 2019 08:38:38 +0000 (00:38 -0800)]
Merge "Add INetd to SystemServiceRegistry"
am:
e3f18bd77c
Change-Id: I510c964ead030f3522c26c123e709117c7c14f6a
Remi NGUYEN VAN [Mon, 28 Jan 2019 08:35:46 +0000 (00:35 -0800)]
Merge "Add NetworkStack networking deps to SystemApi" am:
9188b49259
am:
bc7a8f14f4
Change-Id: I843cb189750666a2cb70b1960d49dfe797f3cf36
Remi NGUYEN VAN [Mon, 28 Jan 2019 08:27:02 +0000 (08:27 +0000)]
Merge "Add INetd to SystemServiceRegistry"
Remi NGUYEN VAN [Mon, 28 Jan 2019 08:26:39 +0000 (00:26 -0800)]
Merge "Add NetworkStack networking deps to SystemApi"
am:
9188b49259
Change-Id: Id8b31f100ab07ca9a38f4cff26c719dd9d74bc54
Remi NGUYEN VAN [Mon, 28 Jan 2019 08:12:55 +0000 (08:12 +0000)]
Merge "Add NetworkStack networking deps to SystemApi"
Yohei Yukawa [Mon, 28 Jan 2019 07:18:32 +0000 (23:18 -0800)]
Fix InputMethodSettings#getInt() for nonexistent key when copy-on-write is on
It turns out that InputMethodSettings#getInt() has always returned 0
instead of the specified default value when copy-on-write is on and
the specified key does not exist since the mechanism was introduced
to support direct-boot [1].
Most likely this would not have been a big issue, but let's fix it
just in case.
[1]: I9c6f9bb3d51174198e5f73588637f87ea0d90e11
68645a638ad1bfb734b2b0f56b17fe206bb891c5
Bug:
26279466
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Change-Id: If2abc0604372cf394105db9395706aaa0f570431
Remi NGUYEN VAN [Mon, 28 Jan 2019 06:57:25 +0000 (06:57 +0000)]
Merge "Move NetworkUtils used by NetworkStack"
Charles Chen [Thu, 24 Jan 2019 14:19:37 +0000 (22:19 +0800)]
Notify SystemUI when ActivityDisplay is ready
Bug:
120748674
Test: atest ActivityManagerMultiDisplayTests#testNavBarNotShowingOnDisplayWithoutDecor * 100
Test: atest ActivityManagerMultiDisplayTests#testNavBarShowingOnDisplayWithDecor * 100
Test: atest ActivityManagerMultiDisplayTests#testNavBarNotShowingOnPrivateDisplay * 100
Test: atest SystemUITests
Change-Id: I302a35b9b860ab881b60c6407edabb2da16b75f8
Remi NGUYEN VAN [Mon, 28 Jan 2019 01:24:42 +0000 (10:24 +0900)]
Add NetworkObserverRegistry to NetworkStack
The NetworkObserverRegistry will replace usage of
NetworkManagementService in the app.
Test: m, booted, WiFi working
Bug:
112869080
Change-Id: Ic7f0114d0c9361dd2408e47bb04a8dd44a908a47
Remi NGUYEN VAN [Thu, 24 Jan 2019 23:54:08 +0000 (08:54 +0900)]
Move NetworkUtils used by NetworkStack
Depending on usage move into NetworkStackUtils or shared
Inet4AddressUtils.
Test: atest FrameworksNetTests NetworkStackTests
Bug:
112869080
(Cherry-pick of aosp/881952)
Change-Id: Ie20dcee375b377236004a7689890729493aca857
Remi NGUYEN VAN [Sun, 20 Jan 2019 00:35:10 +0000 (09:35 +0900)]
Move NetworkUtils used by NetworkStack
Depending on usage move into NetworkStackUtils or shared
Inet4AddressUtils.
Test: atest FrameworksNetTests NetworkStackTests
Bug:
112869080
Merged-In: Ie20dcee375b377236004a7689890729493aca857
Change-Id: Ib8d000529872796022706a35050fdc2c7141f2ab
Remi NGUYEN VAN [Mon, 28 Jan 2019 04:28:35 +0000 (13:28 +0900)]
Add NetworkStack networking deps to SystemApi
Cherry-pick with conflicts fixed in CaptivePortalLoginActivity imports.
Test: atest FrameworksNetTests
Bug:
112869080
Merged-In: Id59dc06fb85e4ac88098f56b621ec880610759ce
Change-Id: I3c05e8fdd70497426d4fa433295c4fbdad07d9c9
TreeHugger Robot [Mon, 28 Jan 2019 04:05:33 +0000 (04:05 +0000)]
Merge "Change latency to int64"
wilsonshih [Mon, 28 Jan 2019 03:15:09 +0000 (19:15 -0800)]
Merge "Fix theme cannot change due to there is no wallpaper colors." into pi-dev am:
dee98726bf
am:
ff5c8bac7c
Change-Id: Id789abf9c9f96236385ccbab987393e34de7300c
Remi NGUYEN VAN [Mon, 28 Jan 2019 02:40:08 +0000 (11:40 +0900)]
Add INetd to SystemServiceRegistry
Includes @SystemApi for Context.NETD_SERVICE so system apps (including
the network stack) can obtain the service.
Test: m
Bug:
112869080
Change-Id: Ida63747cd30abb7b3c19559803353eb0e42e6efa
wilsonshih [Mon, 28 Jan 2019 03:07:27 +0000 (19:07 -0800)]
Merge "Fix theme cannot change due to there is no wallpaper colors." into pi-dev
am:
dee98726bf
Change-Id: Ic1c76d95bcd9e16c8209e948fc06bd90d4207de7
Lorenzo Colitti [Mon, 28 Jan 2019 02:58:01 +0000 (02:58 +0000)]
Merge "Add NetworkStack networking deps to SystemApi"
TreeHugger Robot [Mon, 28 Jan 2019 02:51:26 +0000 (02:51 +0000)]
Merge "Fix theme cannot change due to there is no wallpaper colors." into pi-dev
Lei Yu [Mon, 28 Jan 2019 02:33:33 +0000 (02:33 +0000)]
Merge "Turn on feature flag for slice injection."
Steven Wu [Mon, 28 Jan 2019 00:12:37 +0000 (00:12 +0000)]
Merge "Add a westworld atom for SystemUI bubbles logging."
Michael Wright [Sun, 27 Jan 2019 23:44:13 +0000 (23:44 +0000)]
Merge "Add new ExternalVibratorService."
Sudheer Shanka [Sun, 27 Jan 2019 23:00:13 +0000 (23:00 +0000)]
Merge "Add Cursor.{set,get}NotificationUris."
Steven Wu [Wed, 23 Jan 2019 19:21:17 +0000 (14:21 -0500)]
Add a westworld atom for SystemUI bubbles logging.
Bug:
111236845
Test: manual
Change-Id: I94736afabd210ac32d430f17a8c5d71f4ada9b87
Kevin Chyn [Sun, 27 Jan 2019 20:23:47 +0000 (12:23 -0800)]
Change latency to int64
Bug:
120161047
Bug:
117060268
Bug:
121072756
Bug:
121071984
Test: Builds
Change-Id: I67a23128a35b76302dbde04b6838420b8731da61
Mike Reed [Sun, 27 Jan 2019 20:46:29 +0000 (20:46 +0000)]
Merge "access hinting via SkFont"
Andrii Kulian [Sun, 27 Jan 2019 19:30:01 +0000 (19:30 +0000)]
Merge changes from topic "multi-resume_with_fix"
* changes:
Don't make active activities that are launched behind
Multiple resumed activities
Kevin Chyn [Sun, 27 Jan 2019 17:15:46 +0000 (17:15 +0000)]
Merge "Update Biometric Atoms"
Yohei Yukawa [Sun, 27 Jan 2019 16:06:30 +0000 (08:06 -0800)]
Add SHOW_IME_WITH_HARD_KEYBOARD to CLONE_TO_MANAGED_PROFILE
With this CL, SHOW_IME_WITH_HARD_KEYBOARD will be shared within the
same profile group.
Since AccessibilityManagerService always reads
SHOW_IME_WITH_HARD_KEYBOARD from the profile parent user [1], in
practice sharing SHOW_IME_WITH_HARD_KEYBOARD within the same profile
group would be the easiest and safest way for now to avoid breaking
SHOW_IME_WITH_HARD_KEYBOARD.
Note that with my previous CL [2], InputMethodSettings already adjust
the target user ID by checking CLONE_TO_MANAGED_PROFILE when writing
secure settings. Hence no change in the InputMethodManagerService
side is necessary.
When work profile is not enabled, there should be no behavior change.
[1]: I530481e102ac376a4506b662862ee1ee74815b40
03a65b04d8c6eb8ba4313e2d94c6cac941c64dc9
[2]: Ieefefb8630ddef3b247ebb865a604e5c72dfb49c
15be5e6f1c19ff329a6382c5063aa58bc92fb36e
Fix:
123379418
Test: manually verified as follows.
1. Build aosp_taimen-userdebug and flash it.
2. adb root
3. adb shell setprop persist.debug.per_profile_ime 1
4. Install Test DPC.
5. Enable managed profile with Test DPC.
6. Attach a Bluetooth hardware keyboard.
7. make -j EditTextVariations
8. adb install -r \
$ANDROID_TARGET_OUT_TESTCASES/EditTextVariations/EditTextVariations.apk
9. adb shell am start --user 10 -n \
com.android.inputmethod.tools.edittextvariations/.EditTextVariations
10. Focus in the top edit field on the EditTextVariations.
11. Tap the IME switcher icon on the navigation bar.
12. adb shell settings get secure --user 0 show_ime_with_hard_keyboard
-> 0
13. adb shell settings get secure --user 10 show_ime_with_hard_keyboard
-> 0
14. Toggle "Show virtual keyboard" button to enable it.
15. adb shell settings get secure --user 0 show_ime_with_hard_keyboard
-> 1
16. adb shell settings get secure --user 10 show_ime_with_hard_keyboard
-> 1
Change-Id: Iacb79b24d6bd97495ac81a58c1df651cf594a8c2
TreeHugger Robot [Sun, 27 Jan 2019 06:33:24 +0000 (06:33 +0000)]
Merge "Check if Test Harness Mode is enabling on boot"
Kevin Chyn [Thu, 17 Jan 2019 19:54:40 +0000 (11:54 -0800)]
Update Biometric Atoms
Framework will add logging in the next CL
Bug:
120161047
Bug:
117060268
Bug:
121072756
Bug:
121071984
Test: Builds
Change-Id: I673d8af8be78be11b5eac249c47847ebeca2cd2e
Jeff Sharkey [Sun, 27 Jan 2019 03:03:48 +0000 (03:03 +0000)]
Merge "Get CtsProviderTestCases building against API."
Jeff Sharkey [Fri, 25 Jan 2019 18:15:38 +0000 (11:15 -0700)]
Get CtsProviderTestCases building against API.
To help confirm that we're actually testing developer-visible
behaviors, we need to build against public APIs, since there have
been plenty of examples in this suite of "testing" hidden API
behaviors, which are then misleading to developers.
Bug:
120429729
Test: atest cts/tests/tests/provider/
Exempt-From-Owner-Approval: Trivial API annotations
Change-Id: I07fe33e54f611a6060217f0706fb99b809961f4d
Tej Singh [Sun, 27 Jan 2019 02:32:37 +0000 (02:32 +0000)]
Merge "APIs for registering config activation broadcasts"
Howard Ro [Sun, 27 Jan 2019 02:00:30 +0000 (02:00 +0000)]
Merge "Add WatchdogRollbackOccurred atom"
TreeHugger Robot [Sun, 27 Jan 2019 01:07:13 +0000 (01:07 +0000)]
Merge "Hide new ColorSpace APIs"
Yu-Han Yang [Sun, 27 Jan 2019 00:45:39 +0000 (16:45 -0800)]
Merge "Add yuhany@ and aadmal@ to OWNERS" am:
223d681503 am:
f4fcb2fde2
am:
1b52797fbe
Change-Id: I3c46a08c0eb762a4f4fa35d13241b57a72ae5260
Yu-Han Yang [Sun, 27 Jan 2019 00:35:13 +0000 (16:35 -0800)]
Merge "Add yuhany@ and aadmal@ to OWNERS" am:
223d681503
am:
f4fcb2fde2
Change-Id: Iec8b42c25146a1444ef2c5e5d3b30877922307a9
TreeHugger Robot [Sun, 27 Jan 2019 00:29:28 +0000 (00:29 +0000)]
Merge "Fix hardware protected path for SDK ImageReader."
Yu-Han Yang [Sun, 27 Jan 2019 00:25:12 +0000 (16:25 -0800)]
Merge "Add yuhany@ and aadmal@ to OWNERS"
am:
223d681503
Change-Id: Ibf7c18fc2936bc0b854b914f41e41966a4485466
TreeHugger Robot [Sun, 27 Jan 2019 00:12:28 +0000 (00:12 +0000)]
Merge "Amend flagFlipUpdateOccurred atom"
Treehugger Robot [Sun, 27 Jan 2019 00:08:17 +0000 (00:08 +0000)]
Merge "Add yuhany@ and aadmal@ to OWNERS"
Peiyong Lin [Sat, 26 Jan 2019 22:10:16 +0000 (22:10 +0000)]
Merge "Add Display.getPreferredWideGamutColorSpace()."
Peiyong Lin [Sat, 26 Jan 2019 22:09:13 +0000 (22:09 +0000)]
Merge "Eliminate the usage of ConfigStore."
Joe Onorato [Sat, 26 Jan 2019 19:24:44 +0000 (19:24 +0000)]
Merge "[bit] Use aapt2 instead of aapt, and don't also adb install apps on the system partition"
Joe Onorato [Sat, 26 Jan 2019 19:22:03 +0000 (19:22 +0000)]
Merge "[bit] Cache the build variables so we don't have to run make to figure them out unless the environment has changed."
Sudheer Shanka [Sat, 26 Jan 2019 18:40:42 +0000 (10:40 -0800)]
Add Cursor.{set,get}NotificationUris.
Bug:
120879205
Test: manual
Test: atest cts/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
Change-Id: If3be228dc6b08ea58d24c9209822f9d8c2348082
Hongming Jin [Sat, 26 Jan 2019 19:19:18 +0000 (19:19 +0000)]
Merge "Add API to SmsManager to allow apps to authenticate user account through sms without requesting sms permissions."
Joe Onorato [Fri, 14 Dec 2018 23:46:27 +0000 (15:46 -0800)]
[bit] Use aapt2 instead of aapt, and don't also adb install apps on the system partition
Test: bit services
Change-Id: I7d44ffbb2745b1a6265bbc77f24f885e5f1d3981
Joe Onorato [Mon, 14 Jan 2019 23:30:05 +0000 (15:30 -0800)]
[bit] Cache the build variables so we don't have to run make to figure them out unless the environment has changed.
Test: bit GooglePermissionControllerTest:*
Change-Id: Ie79226026477df22115ed1146875b82c2255bdef
Michael Wright [Wed, 12 Dec 2018 19:45:09 +0000 (19:45 +0000)]
Add new ExternalVibratorService.
This lets services outside of the vibrator service (and outside of
system_server) take control of the vibrator hardware. We still apply
policy in vibrator service, however, and can ask them to mute their
operations so we can give more critical haptic feedback when necessary.
Bug:
111457573
Test: manual
Change-Id: Ib7d06aa5940790cac627499acb23e4f0bda1b035
Soonil Nagarkar [Sat, 26 Jan 2019 16:39:28 +0000 (16:39 +0000)]
Merge "Fix potential deadlock in ServiceWatcher"
Mike Reed [Sat, 26 Jan 2019 15:17:31 +0000 (10:17 -0500)]
access hinting via SkFont
Test: make
Change-Id: I12f75d9bd10517528c60cd7d3362f7a8af1eb529
Richard Uhler [Sat, 26 Jan 2019 07:31:28 +0000 (07:31 +0000)]
Merge changes Ic2bb4798,I2a409de2,I88a50a0e,Ia69342a4,Ia6548e4d, ...
* changes:
Use "commit" instead of "execute" for rollbacks.
Rename PACKAGE_ROLLBACK_EXECUTED to ROLLBACK_COMMITTED.
Remove unused RollbackManager APIs.
Use RollbackManager.getAvailableRollbacks in RollbackTest
Use new RollbackManager API in RollbackPackageHealthObserver.
Add RollbackManager.getAvailableRollbacks API.
Include all relevant packages in RollbackInfo.
Kevin Chyn [Sat, 26 Jan 2019 04:27:00 +0000 (04:27 +0000)]
Merge changes from topics "cc-implicit-2", "cc-implicit"
* changes:
Deprecate CC and add BP#buildIntent()
Revert "Add plumbing for setRequireConfirmation to CC"
TreeHugger Robot [Sat, 26 Jan 2019 04:19:41 +0000 (04:19 +0000)]
Merge "Support multi-ABI in tests."
TreeHugger Robot [Sat, 26 Jan 2019 04:09:32 +0000 (04:09 +0000)]
Merge "Remove RuntimePermPresSvc#onRevokeRuntimePerm"
TreeHugger Robot [Sat, 26 Jan 2019 03:57:13 +0000 (03:57 +0000)]
Merge "Hide distracting pkg notifications"
TreeHugger Robot [Sat, 26 Jan 2019 02:21:44 +0000 (02:21 +0000)]
Merge "Add closing div tag for ContentResolver javadoc"
Nick Kralevich [Sat, 26 Jan 2019 02:10:33 +0000 (18:10 -0800)]
Merge "more O_CLOEXEC" am:
350f48328b am:
51aec2267c
am:
8d26cdbd34
Change-Id: I2624180a9284beced0677de070b600c21fa24ae6
Kevin Chyn [Fri, 25 Jan 2019 00:32:38 +0000 (16:32 -0800)]
Deprecate CC and add BP#buildIntent()
To ensure future BP builder changes don't require a 1:1 addition to the
CC API, we're deprecating CC and moving the API to BP.
Since CDC is an activity, and BP can't receive onActivityResult from CDC,
we need to have BiometricService launch CDC. CDC will return auth/reject
results to BiometricService using a private protected aidl method, which
can then forward the reuslt to BP/app.
Bug:
111461540
Test: builds
Test: demo app, receives correct callbacks
Change-Id: I7111ca2842534a596302fe0eb7338fbfaca72eec
Nick Kralevich [Sat, 26 Jan 2019 02:02:23 +0000 (18:02 -0800)]
Merge "more O_CLOEXEC" am:
350f48328b
am:
51aec2267c
Change-Id: I36d95d214a9b07c474b8a8c5fdb6dbf15c4cf535
Tej Singh [Tue, 22 Jan 2019 19:33:51 +0000 (11:33 -0800)]
APIs for registering config activation broadcasts
Creates a StatsManager API to register a pending intent that is invoked
whenever the active status of any of any config sent by that uid
changes.
ag/
6112554 and further cls are needed to properly send back the pending
intent.
Bug:
123372077
Test: build success on blueline-eng. More thorough testing should be
done once ag/
6112554 is submitted.
Change-Id: I36985c9820d4e7ac178064924190af88ea822254
Nick Kralevich [Sat, 26 Jan 2019 01:51:51 +0000 (17:51 -0800)]
Merge "more O_CLOEXEC"
am:
350f48328b
Change-Id: I14c8a19b241e29ad4a9bd74d8ed904aa2ef7e5b3
Kevin Chyn [Fri, 25 Jan 2019 00:06:46 +0000 (00:06 +0000)]
Revert "Add plumbing for setRequireConfirmation to CC"
This reverts commit
d75a03b722cceee137c7834117569d7e36eeac73.
Reason for revert: Adding functionality differently
Change-Id: I90ac64c89566589797f1ad0bf69fefee3fbd04e1
Kevin Chyn [Sat, 26 Jan 2019 01:47:06 +0000 (01:47 +0000)]
Merge "Add additional acquired constants"
Treehugger Robot [Sat, 26 Jan 2019 01:32:15 +0000 (01:32 +0000)]
Merge "more O_CLOEXEC"
Yohei Yukawa [Sat, 26 Jan 2019 01:27:03 +0000 (17:27 -0800)]
Take CLONE_TO_MANAGED_PROFILE into account in InputMethodSettings
This is a preparation to clone SHOW_IME_WITH_HARD_KEYBOARD to profile
users.
With this CL, InputMethodSettings takes CLONE_TO_MANAGED_PROFILE into
account when writing secure settings. The point is that when a secure
settings key is in Settings.Secure.CLONE_TO_MANAGED_PROFILE, the value
needs to be written into the profile parent's settings, not the
current user's one. In this way, InputMethodSettings doesn't need to
be updated when a new entry is added to / removed from
CLONE_TO_MANAGED_PROFILE.
This CL does not change Settings.Secure.CLONE_TO_MANAGED_PROFILE hence
there should be no behavior change.
Bug:
123379418
Test: make -j checkbuild
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Change-Id: Ieefefb8630ddef3b247ebb865a604e5c72dfb49c
Peiyong Lin [Thu, 17 Jan 2019 00:18:22 +0000 (16:18 -0800)]
Add Display.getPreferredWideGamutColorSpace().
Add Display.getPreferredWideGamutColorSpace() to return the preferred wide
color space that the rendering and composition pipeline prefers.
BUG:
120904891
Test: atest android.display.cts.DisplayTest#testGetPreferredWideGamutColorSpace
Change-Id: I1bcd9db72689a734b2a7c097b99a01464810994a
Steven Moreland [Sat, 26 Jan 2019 00:52:39 +0000 (00:52 +0000)]
Merge "framework.jar: Include all radio HIDL libs."
Howard Ro [Fri, 18 Jan 2019 00:52:16 +0000 (16:52 -0800)]
Add WatchdogRollbackOccurred atom
This is going to be logged when a module is rolled back by watchdog for
causing any crash/problem.
Bug:
122808286
Test: not needed for now but will be tested when StatsLog.write is
triggered.
Change-Id: I1a7461b160206ab41e76621759e8dfb78ea0833b
Soonil Nagarkar [Fri, 25 Jan 2019 01:42:49 +0000 (17:42 -0800)]
Fix potential deadlock in ServiceWatcher
Bug:
123363078
Test: manually
Change-Id: I9ac83c37c0c00170f95b505bdac68bb5db6e0283
Daniel Solomon [Thu, 24 Jan 2019 03:33:00 +0000 (19:33 -0800)]
Hide new ColorSpace APIs
A previous change added two new public ColorSpace APIs. These APIs are
being used only by ColorDisplayService for specific purposes, so for now
make them hidden.
Bug
116516917
Change-Id: Ib644d356a84d4122173ea4cafbac88bd63b1afcd
Hongming Jin [Thu, 17 Jan 2019 20:11:59 +0000 (12:11 -0800)]
Add API to SmsManager to allow apps to authenticate user account through
sms without requesting sms permissions.
Bug:
111210542
Test: atest android.telephony.cts.SmsManagerTest
Change-Id: I9b176032d7b2bf578dd1a64745bf4a1e13008a7a
Evan Rosky [Fri, 25 Jan 2019 23:15:36 +0000 (23:15 +0000)]
Merge changes from topics "sf_task_id", "sf_metadata"
* changes:
Add task-id to the task-level surface
Add metadata store to surfaces
Nick Kralevich [Fri, 25 Jan 2019 23:05:34 +0000 (15:05 -0800)]
Merge "even more O_CLOEXECs!" am:
bb5b645454 am:
6130adad16
am:
8da21b7b21
Change-Id: Ia4e37933ee5742f74e7d58e4eaca71f89954aa00
Nick Kralevich [Fri, 25 Jan 2019 22:54:25 +0000 (14:54 -0800)]
Merge "even more O_CLOEXECs!" am:
bb5b645454
am:
6130adad16
Change-Id: Id1538b24d3d213711ad014634071957d5834016f
Nick Kralevich [Fri, 25 Jan 2019 22:43:37 +0000 (14:43 -0800)]
Merge "even more O_CLOEXECs!"
am:
bb5b645454
Change-Id: I8435d69b72dbbbc881bbd43c7a640f3460e5777a
TreeHugger Robot [Fri, 25 Jan 2019 22:42:06 +0000 (22:42 +0000)]
Merge "Add api to change charging state update delay"
Treehugger Robot [Fri, 25 Jan 2019 22:32:40 +0000 (22:32 +0000)]
Merge "even more O_CLOEXECs!"
Jean-Michel Trivi [Fri, 25 Jan 2019 22:31:09 +0000 (22:31 +0000)]
Merge "AudioDeviceBroker in audio service"
Mathieu Chartier [Fri, 25 Jan 2019 22:24:48 +0000 (14:24 -0800)]
[automerger skipped] Merge "[view compilation] Add separate compilation property" am:
9343b88b43 am:
84d59ddcf9
am:
9ff145b7f5 -s ours
am skip reason: change_id Ica79ec076714f76d6ae75d398a2f62d7dd85a6a6 with SHA1
9e7a5f6078 is in history
Change-Id: I6167f0e950a9e405f3eaa7a4dc42d57225321cc5
Khushal [Fri, 25 Jan 2019 22:12:14 +0000 (14:12 -0800)]
Fix hardware protected path for SDK ImageReader.
Ensure IGraphicBufferConsumer is marked protected for ImageReader if
the client requests AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT usage.
BUG: crbug.com/889328
Test: Manual testing.
Change-Id: Ibf898aed08ce6d1030aa8eeb4b240a63c4032058
TreeHugger Robot [Fri, 25 Jan 2019 22:16:00 +0000 (22:16 +0000)]
Merge "Add whitelist setting to proto dump util"