Commit Graph

610621 Commits

Author SHA1 Message Date
Kevin Jeon
a4fe5bbad4 Merge "Remove isServiceConnected() from TelecomManager" 2020-11-16 17:14:38 +00:00
Sally Yuen
2e803babfa Merge changes from topic "a11y_config_bold"
* changes:
  Change forceBoldText to fontWeightAdjustment in TextView
  Change forceBoldText to fontWeightAdjustment in Settings
  Change forceBoldText to fontWeightAdjustment in ActivityTaskManagerService
2020-11-16 16:55:48 +00:00
Sally Yuen
67bf1480cf Merge "Change forceBoldText to fontWeightAdjustment in Configuration" 2020-11-16 16:55:48 +00:00
TreeHugger Robot
474cac5066 Merge "Fix SystemUI count down doesn't work" 2020-11-16 15:56:51 +00:00
Miranda Kephart
9eb5bf1a3d Merge "Add swipe dismissal to screenshots" 2020-11-16 15:47:58 +00:00
Nikita Ioffe
234a3749cc [automerger skipped] Merge "permission: Set min_sdk_version to "30"" into mainline-prod am: 97735e73db -s ours
am skip reason: Change-Id I83dcc7be1ff18e6429955a0fee2596d8b0e19a25 with SHA-1 6836898311 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13044363

Change-Id: I3e0db2347bd80a44d89340533b49771916fa22d7
2020-11-16 15:16:24 +00:00
Nikita Ioffe
97735e73db Merge "permission: Set min_sdk_version to "30"" into mainline-prod 2020-11-16 14:54:28 +00:00
Anton Hansson
d13bbe78eb Merge "Remove api-stubs-docs" am: 8cddd53381 am: 4ef05f5c6c am: 2eed87d3b5 am: 97b23b05dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498698

Change-Id: I317759fc854819fbe8e5ceea84baff3717933172
2020-11-16 14:39:52 +00:00
TreeHugger Robot
f20b2e4b51 Merge "CEC: Extract buildMessage from hex byte string" 2020-11-16 14:39:39 +00:00
TreeHugger Robot
ee771361c6 Merge "StorageNotification.java: Apply FLAG_IMMUTABLE to various PIs" 2020-11-16 14:28:51 +00:00
Felka Chang
920dcad2d3 Fix SystemUI count down doesn't work
StatusBarIconView uses Icon#loadDrawableAsUser to load drawable defined
by the customized Drawable class. context.createContextAsUser with flag
Context.CONTEXT_INCLUDE_CODE can fix the ClassNotFound found problem.
And, it needs to prevent any security issue by checking if the context
is the same app with the process.

If the parameter userId is the same with context.getUserId(), it
shouldn't create the extra Context instance.

Fixes: 171712189
Test: atest \
    CtsGraphicsTestCases:android.graphics.drawable.cts.IconTest \
    FrameworksCoreTests:android.graphics.drawable.IconTest
Change-Id: I267fc6eed90a6a6bba39b9976c1d843734e49dec
2020-11-16 14:20:13 +00:00
Anton Hansson
97b23b05dd Merge "Remove api-stubs-docs" am: 8cddd53381 am: 4ef05f5c6c am: 2eed87d3b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498698

Change-Id: I5731c1581ca4bf9f687ca4fe89a14fcb5e50d52d
2020-11-16 14:08:41 +00:00
Anton Hansson
2eed87d3b5 Merge "Remove api-stubs-docs" am: 8cddd53381 am: 4ef05f5c6c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498698

Change-Id: I19ec72d9f2e6f807be43f36587862b07cae0c530
2020-11-16 13:33:39 +00:00
Antonella Dellanzo
2f5313a71d Merge "Add test transition to reopen ime window app" 2020-11-16 13:32:33 +00:00
Antonella Dellanzo
84dae1335e Merge "Add assertions to CloseAppHomeButtonTest" 2020-11-16 13:32:03 +00:00
TreeHugger Robot
cbd7949e79 Merge changes from topics "CecConfigPowerStateChangeOnActiveSourceLost", "CecConfigSendStandbyOnSleep", "CecConfigSystemAudioModeMuting"
* changes:
  [CEC Configuration] Port 'system_audio_mode_muting'
  [CEC Configuration] Port 'power_state_change_on_active_source_lost'
  [CEC Configuration] Use CEC Config API in the 'send_standby_on_sleep' option
2020-11-16 13:30:10 +00:00
Anton Hansson
4ef05f5c6c Merge "Remove api-stubs-docs" am: 8cddd53381
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498698

Change-Id: Ie50ac5e08b7e025e04b7c9ce2e5a1e7d31163590
2020-11-16 13:15:50 +00:00
Anton Hansson
8cddd53381 Merge "Remove api-stubs-docs" 2020-11-16 12:55:09 +00:00
Inseob Kim
71d21ecd60 Merge "Remove obsolete property ro.kernel.android.tracing" am: 3661fc477c am: cb98552e03 am: 1ee0a2519e am: d15205e7cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498598

Change-Id: I2925414e9cb2ef68ddee4a6fc89c4d4b56e4def8
2020-11-16 12:40:42 +00:00
Inseob Kim
d15205e7cc Merge "Remove obsolete property ro.kernel.android.tracing" am: 3661fc477c am: cb98552e03 am: 1ee0a2519e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498598

Change-Id: Icedff80bb584ab245b039d1bb3f5c56fb31d592c
2020-11-16 12:12:16 +00:00
Inseob Kim
1ee0a2519e Merge "Remove obsolete property ro.kernel.android.tracing" am: 3661fc477c am: cb98552e03
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498598

Change-Id: I548148b5476e9da88987cc45cead8cdd846b404c
2020-11-16 11:55:10 +00:00
Eran Messeri
f3795572af Merge "DPMS: Passing in the right user ID for password checking" 2020-11-16 11:55:06 +00:00
Inseob Kim
cb98552e03 Merge "Remove obsolete property ro.kernel.android.tracing" am: 3661fc477c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498598

Change-Id: I84d3094b305ba713d128656b22639bd43d0c3eb2
2020-11-16 11:29:31 +00:00
Jan Tomljanovic
ca24d8fa36 Merge "Limit the number of posted toasts by package to 5." 2020-11-16 11:10:32 +00:00
Inseob Kim
3661fc477c Merge "Remove obsolete property ro.kernel.android.tracing" 2020-11-16 11:01:22 +00:00
TreeHugger Robot
baf630d362 Merge changes from topic "USB-GADGET-HAL-v1.2"
* changes:
  Add methods for Usb Gadget Hal v1.2
  Support USB Gadget V1.2 HAL
2020-11-16 10:43:46 +00:00
Charles Chen
e9cf1f9847 Merge "Introduce getWindowContextToken" 2020-11-16 08:47:01 +00:00
Alex Johnston
68334bb539 Merge "add MANAGE_CREDENTIALS appop" 2020-11-16 07:48:18 +00:00
Charles Chen
468a11afdd Introduce getWindowContextToken
Also consolidate UI context related flags to ContextType.

Bug: 171280916
Test: atest ContextTest ContextAccessTest
Test: atest WindowContextTest WindowContextTests \
            WindowMetricsTest WindowMetricsTests
Test atest InputMethodServiceStrictModeTest \
           InputMethodMenuControllerTest
Test atest InputMethodServiceTest#testGetDisplay
           StrictModeTest#testIncorrectContextuse_*

Change-Id: I7f3a7f951c664d4c329059942e688ee3a625b992
2020-11-16 14:19:36 +08:00
Tiger Huang
447c519635 [automerger skipped] Merge "DO NOT MERGE: Only restore the positions of types which are controlled" into rvc-qpr-dev am: 9649d433d0 am: a0fc352ae2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12967036

Change-Id: I452d04fef066e6871d791ffffa7fa720f9bfd360
2020-11-16 03:59:49 +00:00
Tiger Huang
6fc96572eb [automerger skipped] DO NOT MERGE: Only restore the positions of types which are controlled am: a496e03194 am: 7843f4925e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12967036

Change-Id: I2317a9f7b401116cb8952897ab0a43a172a95dd9
2020-11-16 03:59:43 +00:00
Tiger Huang
a0fc352ae2 Merge "DO NOT MERGE: Only restore the positions of types which are controlled" into rvc-qpr-dev am: 9649d433d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12967036

Change-Id: I25bceed195462dcc77839b9f21433873f2dafa52
2020-11-16 03:43:54 +00:00
Tiger Huang
7843f4925e DO NOT MERGE: Only restore the positions of types which are controlled am: a496e03194
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12967036

Change-Id: If603ca5fe0c6e7b1ba8e19868875a9390a28d89a
2020-11-16 03:43:42 +00:00
TreeHugger Robot
2c34ec9189 Merge "Add resizing tasks synchronously flicker tests" 2020-11-16 03:40:29 +00:00
Tiger Huang
a418d0912d Merge "Don't let fullscreen app window hide status bar..." 2020-11-16 03:02:54 +00:00
Tiger Huang
9649d433d0 Merge "DO NOT MERGE: Only restore the positions of types which are controlled" into rvc-qpr-dev 2020-11-16 03:00:19 +00:00
Alex Buynytskyy
85e86853c2 Merge "Fix for security logging of missing packages." 2020-11-16 01:32:45 +00:00
Ryan Mitchell
0b27d157dd Merge "Fix DominatorTree for locale and mcc/mnc config" am: 8f2f4e14de am: caff40cad3 am: c9acec6545 am: 518d35c017
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481918

Change-Id: I78ffd81962fdfba38c46590e8b6ae76c582ab77b
2020-11-15 23:05:18 +00:00
Ryan Mitchell
518d35c017 Merge "Fix DominatorTree for locale and mcc/mnc config" am: 8f2f4e14de am: caff40cad3 am: c9acec6545
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481918

Change-Id: I680147cd3a77d96d09c13a2f802bd8e4e7124669
2020-11-15 22:29:51 +00:00
Ryan Mitchell
c9acec6545 Merge "Fix DominatorTree for locale and mcc/mnc config" am: 8f2f4e14de am: caff40cad3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481918

Change-Id: I69131cf7a123dba6210e270d7e1644def5e4398e
2020-11-15 22:11:51 +00:00
Ryan Mitchell
caff40cad3 Merge "Fix DominatorTree for locale and mcc/mnc config" am: 8f2f4e14de
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481918

Change-Id: Iedf0fcdd24fa9ec3ff5ebb3124f9fd12acbbfeec
2020-11-15 21:56:42 +00:00
Ryan Mitchell
8f2f4e14de Merge "Fix DominatorTree for locale and mcc/mnc config" 2020-11-15 21:41:24 +00:00
Neil Fuller
162922a255 Merge "Add resource config for the GeoTz feature" 2020-11-15 13:48:22 +00:00
Eran Messeri
0bd4d928a7 DPMS: Passing in the right user ID for password checking
Rather than pass in the user ID and parent flag, resolve the right user
for which the password requirements need to be checked/retrieved.

This refactoring should introduce no functional changes.

Bug: 165573442
Test: ates com.android.cts.devicepolicy.MixedDeviceOwnerTest#testResetPasswordWithToken com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testResetPasswordWithToken
Change-Id: I97ca0d40a01673939e64c23f357fc38ca5427a8f
2020-11-15 11:12:37 +00:00
Hai Zhang
1ca56e86a8 Merge "Third batch of permission in-process API refactoring." 2020-11-15 05:49:48 +00:00
Alex Buynytskyy
6ede83e600 Fix for security logging of missing packages.
Better error cases handling.
Using internal handler to process digests to not overcommit
PackageManager's.

Fixes: 170777013
Test: atest OrgOwnedProfileOwnerTest#testSecurityLogging
Change-Id: I741c10ef3ceeec01e5436f92caa6a52d0c6b6003
2020-11-15 05:34:38 +00:00
Hai Zhang
6544279fb3 Merge "Second batch of permission in-process API refactoring." 2020-11-15 01:36:35 +00:00
Hangyu Kuang
671688d3d4 Merge "transcoding: Unhide setClientCapabilities." 2020-11-14 23:43:45 +00:00
Mehdi Alizadeh
e6daf83a8d Merge "Adds owners to shortcuts related classes in framework" am: ba6f395188 am: 76bcea6550 am: 4d92751539 am: 4268bece0c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1477129

Change-Id: Iadf99bde3b5ccca5a1632a48877647571457b7fb
2020-11-14 22:46:56 +00:00
Mehdi Alizadeh
4268bece0c Merge "Adds owners to shortcuts related classes in framework" am: ba6f395188 am: 76bcea6550 am: 4d92751539
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1477129

Change-Id: Ib6b1ad6aca0c6531285ae296cdcdfc7b1163dad5
2020-11-14 22:34:53 +00:00