OSDN Git Service

android-x86/frameworks-base.git
5 years agoMerge "Avoid crashing when sensors are under stress"
TreeHugger Robot [Sat, 9 Mar 2019 03:14:47 +0000 (03:14 +0000)]
Merge "Avoid crashing when sensors are under stress"

5 years agoMerge "Show only user sensitive ops in system ui"
TreeHugger Robot [Sat, 9 Mar 2019 03:05:33 +0000 (03:05 +0000)]
Merge "Show only user sensitive ops in system ui"

5 years agoMerge "Revert "Revert "Set the "settings_network_and_internet_v2" flag to on by defau...
TreeHugger Robot [Sat, 9 Mar 2019 02:54:51 +0000 (02:54 +0000)]
Merge "Revert "Revert "Set the "settings_network_and_internet_v2" flag to on by default"""

5 years agoMerge "Delete the color extraction blacklist"
TreeHugger Robot [Sat, 9 Mar 2019 02:40:35 +0000 (02:40 +0000)]
Merge "Delete the color extraction blacklist"

5 years agoMerge "Updated API docs."
Jeff Sharkey [Sat, 9 Mar 2019 02:02:21 +0000 (02:02 +0000)]
Merge "Updated API docs."

5 years agoMerge "Use default scrim for vertical power menu layout."
TreeHugger Robot [Sat, 9 Mar 2019 01:51:27 +0000 (01:51 +0000)]
Merge "Use default scrim for vertical power menu layout."

5 years agoMerge "Add nullability annotations to Handler's public API"
TreeHugger Robot [Sat, 9 Mar 2019 01:39:52 +0000 (01:39 +0000)]
Merge "Add nullability annotations to Handler's public API"

5 years agoMerge "ContentSuggestionsService - fix deprecation messages."
TreeHugger Robot [Sat, 9 Mar 2019 01:18:10 +0000 (01:18 +0000)]
Merge "ContentSuggestionsService - fix deprecation messages."

5 years agoMerge "Send deleteIntent when a bubble is dismissed"
TreeHugger Robot [Sat, 9 Mar 2019 01:08:07 +0000 (01:08 +0000)]
Merge "Send deleteIntent when a bubble is dismissed"

5 years agoMerge "Make pixel shifting of custom clocks consistent with default"
TreeHugger Robot [Sat, 9 Mar 2019 00:50:35 +0000 (00:50 +0000)]
Merge "Make pixel shifting of custom clocks consistent with default"

5 years agoUpdate document of setSubscriptionEnabled public API.
Malcolm Chen [Fri, 8 Mar 2019 23:27:38 +0000 (15:27 -0800)]
Update document of setSubscriptionEnabled public API.

Bug: 126391008
Test: build
Change-Id: Iffb7895f94f8d0b2d071edb1e06c8e99be14be4f

5 years agoMerge "Check mChooserListAdapter for null when using App Predictor Service"
TreeHugger Robot [Fri, 8 Mar 2019 23:45:46 +0000 (23:45 +0000)]
Merge "Check mChooserListAdapter for null when using App Predictor Service"

5 years agoAvoid crashing when sensors are under stress
Lucas Dupin [Fri, 8 Mar 2019 23:04:06 +0000 (15:04 -0800)]
Avoid crashing when sensors are under stress

Fixes: 127657926
Test: make
Change-Id: Ifb24032454fd76860758cc983e877f5db314d0d3

5 years agoMerge "Revert "Avoid NPE under stress conditions""
Lucas Dupin [Fri, 8 Mar 2019 23:22:01 +0000 (23:22 +0000)]
Merge "Revert "Avoid NPE under stress conditions""

5 years agoRevert "Revert "Set the "settings_network_and_internet_v2" flag to on by default""
Antony Sargent [Fri, 8 Mar 2019 23:20:58 +0000 (23:20 +0000)]
Revert "Revert "Set the "settings_network_and_internet_v2" flag to on by default""

This reverts commit c9a5c72ab8dfcae41d58b9b5a0704f1ef8c73903.

Reason for revert: The underlying problem for the *original* revert is fixed in ag/6671099, so now we can revert the revert (after ag/6671099 lands).

Change-Id: I01e5ebac8140b253bee9d19981eff53365d3bccd

5 years agoMerge "Tint screenshot frame black in dark mode"
Beth Thibodeau [Fri, 8 Mar 2019 23:01:54 +0000 (23:01 +0000)]
Merge "Tint screenshot frame black in dark mode"

5 years agoRevert "Avoid NPE under stress conditions"
Lucas Dupin [Fri, 8 Mar 2019 22:59:21 +0000 (22:59 +0000)]
Revert "Avoid NPE under stress conditions"

This reverts commit 6798f1578a4646222aaac126bfd3292d1a0bb268.

Reason for revert: 127996235
Fixes: 127996235
Change-Id: I51b2afa558fe71cb64e12e37e36132f3e0190c5d

5 years agoMerge "Fix default stiffness to not be 100x the reasonable default."
TreeHugger Robot [Fri, 8 Mar 2019 23:00:31 +0000 (23:00 +0000)]
Merge "Fix default stiffness to not be 100x the reasonable default."

5 years agoShow only user sensitive ops in system ui
Philip P. Moltmann [Thu, 7 Mar 2019 18:06:11 +0000 (10:06 -0800)]
Show only user sensitive ops in system ui

Test: Looked at system ui button when starting maps and camera
Change-Id: Id6a9a64162200281c5c94671668255f258db36b3

5 years agoMerge "Remember to prepare() jobs when synthesizing them"
Chris Tate [Fri, 8 Mar 2019 22:20:31 +0000 (22:20 +0000)]
Merge "Remember to prepare() jobs when synthesizing them"

5 years agoUpdated API docs.
Jeff Sharkey [Fri, 8 Mar 2019 22:09:08 +0000 (15:09 -0700)]
Updated API docs.

Bug: 121324710
Test: manual
Change-Id: I79eabd16bb87428800e5654f117227160b496132

5 years agoMerge "Clean up attribute apis based on api council feedback."
Aurimas Liutikas [Fri, 8 Mar 2019 22:02:17 +0000 (22:02 +0000)]
Merge "Clean up attribute apis based on api council feedback."

5 years agoSend deleteIntent when a bubble is dismissed
Mark Renouf [Thu, 7 Mar 2019 18:01:59 +0000 (13:01 -0500)]
Send deleteIntent when a bubble is dismissed

Test: atest BubbleControllerTest
Bug: 124381186
Change-Id: Ie332dc394c25a143e75b3f9caa46de6386b392db

5 years agoMerge "Use RoleControllerService for role related APIs."
TreeHugger Robot [Fri, 8 Mar 2019 21:51:25 +0000 (21:51 +0000)]
Merge "Use RoleControllerService for role related APIs."

5 years agoMerge "Adjusts the formula for minimum X velocity."
Josh Tsuji [Fri, 8 Mar 2019 21:49:28 +0000 (21:49 +0000)]
Merge "Adjusts the formula for minimum X velocity."

5 years agoMerge "Save the stack position on dismiss, so new bubbles appear in the original...
Josh Tsuji [Fri, 8 Mar 2019 21:47:01 +0000 (21:47 +0000)]
Merge "Save the stack position on dismiss, so new bubbles appear in the original position."

5 years agoMerge "Get permissions flags with GET_RUNTIME_PERMISSION"
Philip P. Moltmann [Fri, 8 Mar 2019 21:34:01 +0000 (21:34 +0000)]
Merge "Get permissions flags with GET_RUNTIME_PERMISSION"

5 years agoMerge "Add RoleControllerManager for role controller service."
TreeHugger Robot [Fri, 8 Mar 2019 21:32:00 +0000 (21:32 +0000)]
Merge "Add RoleControllerManager for role controller service."

5 years agoMake pixel shifting of custom clocks consistent with default
Robert Snoeberger [Fri, 8 Mar 2019 21:27:04 +0000 (16:27 -0500)]
Make pixel shifting of custom clocks consistent with default

Bug: 122301289
Test: atest frameworks/base/packages/SystemUI/tests/src/com/android/keyguard/clock/
Change-Id: I503d05a67c4b6a1fdcd188ade20d19b801c8700f

5 years agoContentSuggestionsService - fix deprecation messages.
Zak Cohen [Fri, 8 Mar 2019 21:06:07 +0000 (13:06 -0800)]
ContentSuggestionsService - fix deprecation messages.

Bug: build fix
Test: compile
Change-Id: I77e91ee2302310b645747019682781d8e3204bd0

5 years agoDelete the color extraction blacklist
Robert Snoeberger [Thu, 7 Mar 2019 15:30:05 +0000 (10:30 -0500)]
Delete the color extraction blacklist

Bug: 124180048
Test: TonalTest passes
Change-Id: Ia3c00d88e2b224a5ea2f81e3734f2b3eff8a712a

5 years agoCheck mChooserListAdapter for null when using App Predictor Service
George Hodulik [Wed, 6 Mar 2019 20:00:26 +0000 (12:00 -0800)]
Check mChooserListAdapter for null when using App Predictor Service

mChooserListAdapter will be null if there are no apps that can perfrom
the action (Share, Open With).

Bug:127305716
Test: Flashed and got the appropriate behavior: https://screenshot.googleplex.com/VcJFGHadspN
Change-Id: I5ca647cd974a02041522409fc070c27df2bdc9c4

5 years agoMerge "Add carrier config to use 3GPP application on CDMA/CDMA-LTE phone."
TreeHugger Robot [Fri, 8 Mar 2019 20:12:36 +0000 (20:12 +0000)]
Merge "Add carrier config to use 3GPP application on CDMA/CDMA-LTE phone."

5 years agoTint screenshot frame black in dark mode
Beth Thibodeau [Fri, 8 Mar 2019 19:32:51 +0000 (14:32 -0500)]
Tint screenshot frame black in dark mode

Fixes: 123034259
Test: visual, demo at https://photos.app.goo.gl/AcyoYfZu6FX5qkaPA
Change-Id: I1834f068953a44deb266111ad668589fc8ade29f

5 years agoMerge "PlayerBase volume: make it a volume multiplier"
Jean-Michel Trivi [Fri, 8 Mar 2019 19:52:18 +0000 (19:52 +0000)]
Merge "PlayerBase volume: make it a volume multiplier"

5 years agoFix default stiffness to not be 100x the reasonable default.
Joshua Tsuji [Fri, 8 Mar 2019 19:43:25 +0000 (14:43 -0500)]
Fix default stiffness to not be 100x the reasonable default.

Test: Clear settings, observe bubbles that spring instead of not springing because they're 100x too stiff.
Change-Id: I88045ff92e3323f7e9474958af063d5fafa4a21b

5 years agoMerge "Don't touch system_ce until the first user unlock."
TreeHugger Robot [Fri, 8 Mar 2019 19:44:02 +0000 (19:44 +0000)]
Merge "Don't touch system_ce until the first user unlock."

5 years agoPlayerBase volume: make it a volume multiplier
Jean-Michel Trivi [Tue, 5 Mar 2019 17:51:40 +0000 (09:51 -0800)]
PlayerBase volume: make it a volume multiplier

Make PlayerBase / PlayerProxy volume control act as a multiplier,
  not as an override of the volume set by the subclass
Bug: 78930229
Test: see test app in bug

Change-Id: I4c189425282c1a709648e0be14791c3382e83e82

5 years agoUse default scrim for vertical power menu layout.
Steve Elliott [Wed, 6 Mar 2019 18:53:19 +0000 (13:53 -0500)]
Use default scrim for vertical power menu layout.

Test: manual
Change-Id: I9f624ce030d7c09bed0dfd04c8b5d11b3bc310ae

5 years agoMerge "Store gesture counts in Secure Settings"
Beverly Tai [Fri, 8 Mar 2019 19:41:29 +0000 (19:41 +0000)]
Merge "Store gesture counts in Secure Settings"

5 years agoMerge "ContentSuggestionsService - add shell commands to disable default."
Zak Cohen [Fri, 8 Mar 2019 19:35:11 +0000 (19:35 +0000)]
Merge "ContentSuggestionsService - add shell commands to disable default."

5 years agoMerge "ContentSuggestionsSevice - rename methods with on* prefixes."
Zak Cohen [Fri, 8 Mar 2019 19:33:57 +0000 (19:33 +0000)]
Merge "ContentSuggestionsSevice - rename methods with on* prefixes."

5 years agoMerge "Prevent querying settings when no active user"
Christine Franks [Fri, 8 Mar 2019 19:30:01 +0000 (19:30 +0000)]
Merge "Prevent querying settings when no active user"

5 years agoMerge "Address API review from the council"
TreeHugger Robot [Fri, 8 Mar 2019 19:29:48 +0000 (19:29 +0000)]
Merge "Address API review from the council"

5 years agoMerge "Change batteryTip text"
TreeHugger Robot [Fri, 8 Mar 2019 19:15:24 +0000 (19:15 +0000)]
Merge "Change batteryTip text"

5 years agoMerge "Add Wifi Settings Panel API"
TreeHugger Robot [Fri, 8 Mar 2019 19:13:09 +0000 (19:13 +0000)]
Merge "Add Wifi Settings Panel API"

5 years agoAdd nullability annotations to Handler's public API
Jake Wharton [Fri, 8 Mar 2019 17:05:53 +0000 (12:05 -0500)]
Add nullability annotations to Handler's public API

Fixes: 126702574
Test: none
Change-Id: I396665e0971c6dc8eabbcfa32dee07bcdce13061

5 years agoFactor out runtime broadcast receivers in IMMS
Yohei Yukawa [Fri, 8 Mar 2019 18:48:26 +0000 (10:48 -0800)]
Factor out runtime broadcast receivers in IMMS

This is a follow up CL to my previous CL, which made
ACTION_CLOSE_SYSTEM_DIALOGS handler multi-user-aware.

This CL does not change any logic, but just factor out the code by
extracting out logic into a dedicated inner class.

This is a mechanical refactoring. There should be no behavior change.

 [1]: Id71e6f8122be05e27545fa9d6b95a0b6156d202c
      4225c7d77587ac4f1066fba179e85ae7a4e6b727

Bug: 127810562
Test: Manually verified as follows.
   1. Build aosp_blueline-userdebug and flash it.
   2. adb shell pm create-user test_user
   3. adb shell am switch-user 10
   4. adb shell wm dismiss-keyguard
   5. atest android.view.inputmethod.cts.InputMethodManagerTest#testShowInputMethodPicker
Test: Manually verified as follows.
   1. Build aosp_blueline-userdebug and flash it.
   2. adb shell pm create-user test_user
   3. adb shell am switch-user 10
   4. adb shell wm dismiss-keyguard
   5. make -j SoftKeyboard
   6. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
   7. adb shell ime enable com.example.android.softkeyboard/.SoftKeyboard
   8. Tap the search field of the launcher.
   9. Make sure AOSP Keyboard is shown.
  10. Tap the IME switcher icon on the navigation bar.
  11. Make sure IME switcher dialog is shown.
  12. adb shell am broadcast -a android.intent.action.CLOSE_SYSTEM_DIALOGS --user 0
  13. Make sure that the IME switcher dialog is not dismissed.
  14. adb shell am broadcast -a android.intent.action.CLOSE_SYSTEM_DIALOGS --user 10
  15. Make sure that the IME switcher dialog is dismissed.
  16. Tap the IME switcher icon on the navigation bar again.
  17. Make sure IME switcher dialog is shown.
  18. adb shell am broadcast -a android.intent.action.CLOSE_SYSTEM_DIALOGS --user all
  19. Make sure that the IME switcher dialog is dismissed.
  20. Tap the IME switcher icon on the navigation bar again.
  21. Make sure IME switcher dialog is shown.
  22. adb shell am broadcast -a android.intent.action.CLOSE_SYSTEM_DIALOGS --user current
  23. Make sure that the IME switcher dialog is dismissed.
Change-Id: Iba57f62b826703d37afc676f8659e65b428b3915

5 years agoMerge "Dismiss bubble stack when a new task is started from it"
Mark Renouf [Fri, 8 Mar 2019 18:46:42 +0000 (18:46 +0000)]
Merge "Dismiss bubble stack when a new task is started from it"

5 years agoMerge "Revert "Run settings tests when adding settings""
Dan Shi [Fri, 8 Mar 2019 18:43:42 +0000 (18:43 +0000)]
Merge "Revert "Run settings tests when adding settings""

5 years agoRevert "Run settings tests when adding settings"
Dan Shi [Fri, 8 Mar 2019 18:33:56 +0000 (18:33 +0000)]
Revert "Run settings tests when adding settings"

This reverts commit 569be7df9d341a1f9713d1175614bd07f8aa9473.

Reason for revert: b/124346411
Please use package filter for now. A mix of class and package filter is not supported by AJUR as of now. Once that bug is fixed, we can revert the revert.

Change-Id: I12981a97e392a3bc5e0027b3c53cf915b7d480e1

5 years agoMerge "Change the color of keyguard scrims to black"
Lucas Dupin [Fri, 8 Mar 2019 18:24:09 +0000 (18:24 +0000)]
Merge "Change the color of keyguard scrims to black"

5 years agoMerge "Rollback flags: handle cases where flag values are negative"
Shafik Nassar [Fri, 8 Mar 2019 17:57:51 +0000 (17:57 +0000)]
Merge "Rollback flags: handle cases where flag values are negative"

5 years agoMerge "API cleanup: DeviceConfig.Rollback documentation"
Shafik Nassar [Fri, 8 Mar 2019 17:57:51 +0000 (17:57 +0000)]
Merge "API cleanup: DeviceConfig.Rollback documentation"

5 years agoMerge "rename precise carrier id to specific carrier id"
Chen Xu [Fri, 8 Mar 2019 17:57:16 +0000 (17:57 +0000)]
Merge "rename precise carrier id to specific carrier id"

5 years agoAdd carrier config to use 3GPP application on CDMA/CDMA-LTE phone.
mavishsu [Wed, 6 Mar 2019 05:12:23 +0000 (13:12 +0800)]
Add carrier config to use 3GPP application on CDMA/CDMA-LTE phone.

Bug: 124524824
Test: atest GsmCdmaPhoneTest
Change-Id: I2c7feea798df2d9bbfae4ee0847ef151b0d21511

5 years agoMerge "Raise log level to error for install failure"
TreeHugger Robot [Fri, 8 Mar 2019 17:35:18 +0000 (17:35 +0000)]
Merge "Raise log level to error for install failure"

5 years agoMerge "Add sampling interval debug entry."
TreeHugger Robot [Fri, 8 Mar 2019 17:34:33 +0000 (17:34 +0000)]
Merge "Add sampling interval debug entry."

5 years agoMerge "MediaProjectionPermissionActivity: Don't use app icons."
TreeHugger Robot [Fri, 8 Mar 2019 17:22:31 +0000 (17:22 +0000)]
Merge "MediaProjectionPermissionActivity: Don't use app icons."

5 years agoMerge "Larger lock icon"
Lucas Dupin [Fri, 8 Mar 2019 17:14:50 +0000 (17:14 +0000)]
Merge "Larger lock icon"

5 years agoMerge "Setting to bypass lock screen upon face unlock"
Lucas Dupin [Fri, 8 Mar 2019 17:12:04 +0000 (17:12 +0000)]
Merge "Setting to bypass lock screen upon face unlock"

5 years agoMerge "Typographic clock apears above NSSL instead of behind on lock screen."
TreeHugger Robot [Fri, 8 Mar 2019 17:11:53 +0000 (17:11 +0000)]
Merge "Typographic clock apears above NSSL instead of behind on lock screen."

5 years agoMerge "Ensure inital and final state"
Lucas Dupin [Fri, 8 Mar 2019 17:11:07 +0000 (17:11 +0000)]
Merge "Ensure inital and final state"

5 years agoGet permissions flags with GET_RUNTIME_PERMISSION
Philip P. Moltmann [Wed, 6 Mar 2019 04:17:00 +0000 (20:17 -0800)]
Get permissions flags with GET_RUNTIME_PERMISSION

Only require a less-powerful, but heavily restricted permission to the
the permission flags.

Bug: 124317989
Test: Built
Change-Id: Ibdd6baea6dcee57dc327c28663a136e47e80dcb8

5 years agoMerge "Fix damage tracking for RenderNode drawn twice"
TreeHugger Robot [Fri, 8 Mar 2019 16:45:45 +0000 (16:45 +0000)]
Merge "Fix damage tracking for RenderNode drawn twice"

5 years agoMerge "Import translations. DO NOT MERGE"
Bill Yi [Fri, 8 Mar 2019 16:36:11 +0000 (16:36 +0000)]
Merge "Import translations. DO NOT MERGE"

5 years agoMerge "Introduce ApplicationInfo.getAllApkPaths()."
TreeHugger Robot [Fri, 8 Mar 2019 16:32:07 +0000 (16:32 +0000)]
Merge "Introduce ApplicationInfo.getAllApkPaths()."

5 years agoChange batteryTip text
Raff Tsai [Wed, 6 Mar 2019 02:46:46 +0000 (10:46 +0800)]
Change batteryTip text

Fixes: 121042353
Test: Robolectric
Change-Id: I96ee0d88b69b97bed09c6a5d12bf736283503cc7

5 years agoAPI cleanup: DeviceConfig.Rollback documentation
shafik [Wed, 6 Mar 2019 16:30:57 +0000 (16:30 +0000)]
API cleanup: DeviceConfig.Rollback documentation

Added documentation for the different namespaces in
DeviceConfig.Rollback with emphasis on the difference between them.

Added flag type and namespace to the documentation of each flag.

Fixes: 127282774
Test: build
Change-Id: If62a94a0d2775d709af5aebc07b82154842853bc

5 years agoMerge "Merge "Move Camera.EventHandler constructor to greylist" am: b31032b3b0 am...
Android Build Merger (Role) [Fri, 8 Mar 2019 15:46:10 +0000 (15:46 +0000)]
Merge "Merge "Move Camera.EventHandler constructor to greylist" am: b31032b3b0 am: 7746e7c553 am: 847b02cac4"

5 years agoMerge "Move Camera.EventHandler constructor to greylist" am: b31032b3b0 am: 7746e7c553
David Brazdil [Fri, 8 Mar 2019 15:45:34 +0000 (07:45 -0800)]
Merge "Move Camera.EventHandler constructor to greylist" am: b31032b3b0 am: 7746e7c553
am: 847b02cac4

Change-Id: I24e65e05fcf46b584af80c732330623ec521870f

5 years agoForce grid-based Global Actions to use 3x1 row for 3 items.
Aaron Heuckroth [Thu, 7 Mar 2019 21:22:08 +0000 (16:22 -0500)]
Force grid-based Global Actions to use 3x1 row for 3 items.

Test: Automated tests pass, manual testing.

Fixes: 126448432
Change-Id: Ic68c9d8673483179d75cff556980a0b65b43e23c

5 years agoMerge "Merge "Add @NonNull annotations to Hearing Aids Profile APIs" am: 6fa52c9b25...
Android Build Merger (Role) [Fri, 8 Mar 2019 15:38:54 +0000 (15:38 +0000)]
Merge "Merge "Add @NonNull annotations to Hearing Aids Profile APIs" am: 6fa52c9b25 am: 1c5a742cb8 am: 4929093ff7"

5 years agoMerge "Add @NonNull annotations to Hearing Aids Profile APIs" am: 6fa52c9b25 am:...
Stanley Tng [Fri, 8 Mar 2019 15:38:20 +0000 (07:38 -0800)]
Merge "Add @NonNull annotations to Hearing Aids Profile APIs" am: 6fa52c9b25 am: 1c5a742cb8
am: 4929093ff7

Change-Id: Ib1388c480e135f56063da0fe26063ef9e31a6807

5 years agoMerge "Fix Global Actions icon scaling and grid sizing on blueline."
Aaron Heuckroth [Fri, 8 Mar 2019 15:34:47 +0000 (15:34 +0000)]
Merge "Fix Global Actions icon scaling and grid sizing on blueline."

5 years agoMerge "[automerger skipped] Merge "Adding callback for setPreferredDataSubscriptionId...
Android Build Merger (Role) [Fri, 8 Mar 2019 15:25:04 +0000 (15:25 +0000)]
Merge "[automerger skipped] Merge "Adding callback for setPreferredDataSubscriptionId." am: 442084c722 am: 7a2dd73329 am: 879255e83e -s ours am skip reason: change_id Id3f43e024c902d6785017e7866f9e804a486b04f with SHA1 b2b88b3735 is in history"

5 years agoMerge changes from topic "userSensitive"
Philip P. Moltmann [Fri, 8 Mar 2019 15:24:56 +0000 (15:24 +0000)]
Merge changes from topic "userSensitive"

* changes:
  Small issues with FLAG_PERMISSION_USER_SENSITIVE_*
  Introduce and populate PackageManager.FLAG_PERMISSION_USER_VISIBLE

5 years ago[automerger skipped] Merge "Adding callback for setPreferredDataSubscriptionId."...
Xiangyu/Malcolm Chen [Fri, 8 Mar 2019 15:23:10 +0000 (07:23 -0800)]
[automerger skipped] Merge "Adding callback for setPreferredDataSubscriptionId." am: 442084c722 am: 7a2dd73329
am: 879255e83e -s ours
am skip reason: change_id Id3f43e024c902d6785017e7866f9e804a486b04f with SHA1 b2b88b3735 is in history

Change-Id: I6588c1c110702abf2b7c615138ebc0b333d47fa3

5 years agoMerge "Add @Nullable/@NonNull to WifiManager APIs"
TreeHugger Robot [Fri, 8 Mar 2019 15:19:28 +0000 (15:19 +0000)]
Merge "Add @Nullable/@NonNull to WifiManager APIs"

5 years agoMerge "WifiNetworkSpecifier: Builder.build() returns WifiNetworkSpecifier"
TreeHugger Robot [Fri, 8 Mar 2019 15:18:32 +0000 (15:18 +0000)]
Merge "WifiNetworkSpecifier: Builder.build() returns WifiNetworkSpecifier"

5 years agoMerge "Address api council feedback"
Julia Reynolds [Fri, 8 Mar 2019 15:17:00 +0000 (15:17 +0000)]
Merge "Address api council feedback"

5 years agoMerge "Fix NPE in SmsManager and keep existing behavior" am: 8b95375a4a am: 43663aa497
Brad Ebinger [Fri, 8 Mar 2019 15:15:24 +0000 (07:15 -0800)]
Merge "Fix NPE in SmsManager and keep existing behavior" am: 8b95375a4a am: 43663aa497
am: 44c64ec0a3

Change-Id: I874c83a71768fb8bbd0614979fc9520521a80a23

5 years agoMerge "Move Camera.EventHandler constructor to greylist" am: b31032b3b0
David Brazdil [Fri, 8 Mar 2019 15:13:46 +0000 (07:13 -0800)]
Merge "Move Camera.EventHandler constructor to greylist" am: b31032b3b0
am: 7746e7c553

Change-Id: I2d812e9a4bcb1e64b736a84da9a33e4275a4f503

5 years agoMerge "Add @NonNull annotations to Hearing Aids Profile APIs" am: 6fa52c9b25
Stanley Tng [Fri, 8 Mar 2019 15:07:56 +0000 (07:07 -0800)]
Merge "Add @NonNull annotations to Hearing Aids Profile APIs" am: 6fa52c9b25
am: 1c5a742cb8

Change-Id: I50416d50c0723bbf33d83226c5536287096de75d

5 years agoMerge "Add nullability annotations in accordance with the council" am: 049c43f088...
Brad Ebinger [Fri, 8 Mar 2019 15:04:43 +0000 (07:04 -0800)]
Merge "Add nullability annotations in accordance with the council" am: 049c43f088 am: 4a6dd7f3f0
am: ca4f185f0e

Change-Id: I67db6398da083dede7f8a7993b52157fad190454

5 years agoMerge "Adding callback for setPreferredDataSubscriptionId." am: 442084c722
Xiangyu/Malcolm Chen [Fri, 8 Mar 2019 15:00:19 +0000 (07:00 -0800)]
Merge "Adding callback for setPreferredDataSubscriptionId." am: 442084c722
am: 7a2dd73329

Change-Id: I5c19983a4830d65701e6a703a9a874eb27b4c2ef

5 years agoMerge "[automerger skipped] Merge "Add CarrierConfig to use WFC home network mode...
Android Build Merger (Role) [Fri, 8 Mar 2019 14:57:12 +0000 (14:57 +0000)]
Merge "[automerger skipped] Merge "Add CarrierConfig to use WFC home network mode in roaming network" am: 98868a718a am: 3c205266e3 am: 229e22d3fc -s ours am skip reason: change_id I19fd3818c97db2565e13c5272c5307deef1331d1 with SHA1 da0812181d is in history"

5 years agoMerge "MediaPlayer2: make TrackInfo.getLanguage return NonNull"
TreeHugger Robot [Fri, 8 Mar 2019 14:55:35 +0000 (14:55 +0000)]
Merge "MediaPlayer2: make TrackInfo.getLanguage return NonNull"

5 years ago[automerger skipped] Merge "Add CarrierConfig to use WFC home network mode in roaming...
Brad Ebinger [Fri, 8 Mar 2019 14:54:29 +0000 (06:54 -0800)]
[automerger skipped] Merge "Add CarrierConfig to use WFC home network mode in roaming network" am: 98868a718a am: 3c205266e3
am: 229e22d3fc -s ours
am skip reason: change_id I19fd3818c97db2565e13c5272c5307deef1331d1 with SHA1 da0812181d is in history

Change-Id: Ia333a84affcb1022cd08d8e89b464ad65e2f276a

5 years agoMerge "Fix NPE in SmsManager and keep existing behavior" am: 8b95375a4a
Brad Ebinger [Fri, 8 Mar 2019 14:52:29 +0000 (06:52 -0800)]
Merge "Fix NPE in SmsManager and keep existing behavior" am: 8b95375a4a
am: 43663aa497

Change-Id: Ic06416fc68dd8ed12d09978cd96c5cfe7b376225

5 years agoMerge "Add @NonNull annotations to (un)setOffHostForService()" am: 78366e46b2 am...
Ruchi Kandoi [Fri, 8 Mar 2019 14:42:19 +0000 (06:42 -0800)]
Merge "Add @NonNull annotations to (un)setOffHostForService()" am: 78366e46b2 am: 049cd3b67e
am: 0baada5d2a

Change-Id: I207de7be71246830bbf01e0c6b126892997ccadc

5 years agoMerge "Add nullability annotations in accordance with the council" am: 049c43f088
Brad Ebinger [Fri, 8 Mar 2019 14:41:54 +0000 (06:41 -0800)]
Merge "Add nullability annotations in accordance with the council" am: 049c43f088
am: 4a6dd7f3f0

Change-Id: I253a0adfd5dc6fc1d5a51bdcc2774b3e3da7f746

5 years agoMerge "Add CarrierConfig to use WFC home network mode in roaming network" am: 98868a718a
Brad Ebinger [Fri, 8 Mar 2019 14:33:47 +0000 (06:33 -0800)]
Merge "Add CarrierConfig to use WFC home network mode in roaming network" am: 98868a718a
am: 3c205266e3

Change-Id: I0cc2f5f362bd2edb5176bc287b7c4aa0c352c01b

5 years agoMediaProjectionPermissionActivity: Don't use app icons.
Narayan Kamath [Mon, 4 Mar 2019 14:28:27 +0000 (14:28 +0000)]
MediaProjectionPermissionActivity: Don't use app icons.

Always use the "cast" icon because that's what we display in
the status bar and the cast tile.

Bug: 124753835
Test: visual

Change-Id: Ie73d0b87818a6d780e06af41a0a5387878e443a8

5 years ago[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 10c573ff85...
Andrei-Valentin Onea [Fri, 8 Mar 2019 14:33:10 +0000 (06:33 -0800)]
[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 10c573ff85 am: f63b6157a1
am: 4a4717bcee -s ours
am skip reason: change_id I570c08292f8a9f512c96f9dce13f5337718f112c with SHA1 da6e570f1e is in history

Change-Id: I6eeb129848fb396edf461c9a70b70974e166afcf

5 years agoAdd sampling interval debug entry.
Olivier Gaillard [Fri, 8 Mar 2019 11:25:05 +0000 (11:25 +0000)]
Add sampling interval debug entry.

Test: atest BinderCallsStatsTest LooperStatsTest
Change-Id: I5a5d836b2a4d2160196caedeb5a01cccceaa2258

5 years agoMerge "Move Camera.EventHandler constructor to greylist"
David Brazdil [Fri, 8 Mar 2019 14:29:15 +0000 (06:29 -0800)]
Merge "Move Camera.EventHandler constructor to greylist"
am: b31032b3b0

Change-Id: If785b7e4f01db0a0e9b1e8d4e42258375de57dbc

5 years agoMerge "Add @NonNull annotations to (un)setOffHostForService()" am: 78366e46b2
Ruchi Kandoi [Fri, 8 Mar 2019 14:27:29 +0000 (06:27 -0800)]
Merge "Add @NonNull annotations to (un)setOffHostForService()" am: 78366e46b2
am: 049cd3b67e

Change-Id: Ie61c0db82f40015f743bf7455b1c8850337bca7d

5 years ago[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 5d256870aa...
Andrei-Valentin Onea [Fri, 8 Mar 2019 14:26:09 +0000 (06:26 -0800)]
[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 5d256870aa am: 42f62d86b5
am: 2714fef0e5 -s ours
am skip reason: change_id Id84ee490f3435a196fca10a89bda9f7217b750c6 with SHA1 f650e3c286 is in history

Change-Id: I97c3b113e9d1a110e3abf6f088806ee2155a5724

5 years agoMerge "Add @NonNull annotations to Hearing Aids Profile APIs"
Stanley Tng [Fri, 8 Mar 2019 14:25:47 +0000 (06:25 -0800)]
Merge "Add @NonNull annotations to Hearing Aids Profile APIs"
am: 6fa52c9b25

Change-Id: If06dc28087ad2fe14636e0147077b35af7947216