Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
624,399 Commits 3 Branches 0 Tags
1cc73a9adf8a46bc63a16430d2d78ddd778ff045
Commit Graph

624399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
1cc73a9adf Merge "ImageWriter: Convert Blob native format to respective public value" into sc-dev 2021-02-16 19:27:13 +00:00
Winson Chiu
766326b69a Merge changes I5e258e23,I72323430 into sc-dev 
* changes:
  Update isLinkHandlingAllowed to mean all or nothing
  Update intent resolution logic with new rules
 2021-02-16 19:12:22 +00:00
TreeHugger Robot
45e4016bb1 Merge "Don't backup/restore sim-settings if Telephony not present." into sc-dev 2021-02-16 19:06:18 +00:00
Soonil Nagarkar
2727a9130f Merge "Implement stationary location throttling" into sc-dev 2021-02-16 19:04:08 +00:00
Etan Cohen
1792b2e78e Merge "[WIFI] Rename restart callback unregistration method" into sc-dev 2021-02-16 19:03:41 +00:00
TreeHugger Robot
9c28f9708a Merge "pm: Require manifest.json for .dm (dex-metadata) files." into sc-dev 2021-02-16 18:59:42 +00:00
Bram Bonné
640d8ba94e Merge "Expand documentation for PURPOSE_AGREE_KEY" am: 6d3bd2dca6 am: 4f8bcd4261 am: a06ffa1395 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587048

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04bc22715f7908c820a1ac4db2ea65352042acde
 2021-02-16 18:34:39 +00:00
Kohsuke Yatoh
d3279fa99c Merge "Add FontManager#updateFontFamily() API." into sc-dev 2021-02-16 18:32:58 +00:00
Michał Brzeziński
f6888b8de9 Merge "Fixing "updateVerticalPanelPosition" method name" into sc-dev 2021-02-16 18:17:51 +00:00
Bram Bonné
a06ffa1395 Merge "Expand documentation for PURPOSE_AGREE_KEY" am: 6d3bd2dca6 am: 4f8bcd4261 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587048

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8902f84a28b5e588f45e9150aa5c7dc51db73174
 2021-02-16 18:16:28 +00:00
TreeHugger Robot
3e9b141277 Merge "Define system resources for widget's system parameters" into sc-dev 2021-02-16 18:14:05 +00:00
Michał Brzeziński
17cdf54a1e Merge "Implementing basic 2-column shade in landscape" into sc-dev 2021-02-16 18:12:33 +00:00
Gavin Corkery
4803f15861 Merge "Add framework-scheduling libraries" into sc-dev 2021-02-16 17:48:20 +00:00
TreeHugger Robot
b399995df7 Merge "Placeholder implementation of stretch overscroll using offset" into sc-dev 2021-02-16 17:47:50 +00:00
Julia Reynolds
f4eb0eddad Merge "Add new constant for semantic action types." into sc-dev 2021-02-16 17:38:18 +00:00
Bram Bonné
4f8bcd4261 Merge "Expand documentation for PURPOSE_AGREE_KEY" am: 6d3bd2dca6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587048

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib99934e872bd05e6e3f13b091583fb00f6cd3517
 2021-02-16 17:36:37 +00:00
Josh Tsuji
db4738b8ba Merge changes from topic "aod-lockscreen-gx" into sc-dev 
* changes:
  Add additional tests for AOD/unlocked animations.
  Use new GX overlay for new AOD/lockscreen transitions.
 2021-02-16 17:32:47 +00:00
Chris Li
3f11ab66cb Merge "Allow non-resizable apps in split-screen (11/n)" into sc-dev 2021-02-16 17:24:46 +00:00
TreeHugger Robot
f5646294b1 Merge "Redesigns the volume panel!" into sc-dev 2021-02-16 17:09:31 +00:00
Jack Nudelman
55fba4d55f Don't backup/restore sim-settings if Telephony not present. 
Bug: 180023868
Bug: 179947838
Test: make, cts test that caught this issue no pass.
Change-Id: Id898d135ed64a704cc4707dcb796664d9b08264b
 2021-02-16 09:09:04 -08:00
TreeHugger Robot
df5f6d22eb Merge "Convert cycles to mcycles" into sc-dev 2021-02-16 17:08:49 +00:00
Bram Bonné
6d3bd2dca6 Merge "Expand documentation for PURPOSE_AGREE_KEY" 2021-02-16 17:05:00 +00:00
Andrii Kulian
d014bb7414 Merge "Remove hidden API usage in WM Extensions impl" into sc-dev 2021-02-16 16:48:29 +00:00
Cody Kesting
d74bfec966 Merge "Use WakeupMesage for delayed events in VcnGatewayConnection." am: b244bfa4d6 am: fa7111f96a am: e060ec817c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574005

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a8e85d22ecc396f9a85df2b8d7b12f3a25bc7cf
 2021-02-16 16:36:22 +00:00
Cody Kesting
c9bfdd49f4 Merge "Acquire WakeLock while processing Gateway messages." am: 864b62491d am: 5cf38e3d13 am: 2429c94f13 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571012

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I113746da610d025448700ae5f491a55e55ef15a1
 2021-02-16 16:36:04 +00:00
Treehugger Robot
b3ff4ac682 [automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: fcf6560011 am: fc00dda2e9 -s ours am: 70d6495d4d -s ours 
am skip reason: Change-Id I6e9103c3275cb2e6df5dc586588eccd7d2ab6b06 with SHA-1 47bc43a414 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0dcff72fd2a921e9e781acd5ffbb19a8a6a7c98c
 2021-02-16 16:35:39 +00:00
Rajeev Kumar
7e24b8beff Merge "Add keyguard shortcut for opening QS user panel" into sc-dev 2021-02-16 16:10:27 +00:00
Cody Kesting
e060ec817c Merge "Use WakeupMesage for delayed events in VcnGatewayConnection." am: b244bfa4d6 am: fa7111f96a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574005

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I902ed407efa601a1f1ec9ec805aa69da2ccbc22a
 2021-02-16 15:57:20 +00:00
Cody Kesting
2429c94f13 Merge "Acquire WakeLock while processing Gateway messages." am: 864b62491d am: 5cf38e3d13 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571012

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I321b0209ed91a899aff486fab059ae00305eaa47
 2021-02-16 15:57:10 +00:00
Treehugger Robot
70d6495d4d [automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: fcf6560011 am: fc00dda2e9 -s ours 
am skip reason: Change-Id I6e9103c3275cb2e6df5dc586588eccd7d2ab6b06 with SHA-1 47bc43a414 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7396eb4c772714f142c2c1f3831efa533772159b
 2021-02-16 15:56:35 +00:00
Alex Johnston
3f7da94bcf Merge "Allow PO to enable network logging on work profile" into sc-dev 2021-02-16 15:55:26 +00:00
Josh Tsuji
9a951b420a Add additional tests for AOD/unlocked animations. 
Bug: 169693662
Test: atest SystemUITests
Change-Id: I8216a45ddb8649ea55abed5a5d6a398cb1e0256f
 2021-02-16 15:51:25 +00:00
Cody Kesting
fa7111f96a Merge "Use WakeupMesage for delayed events in VcnGatewayConnection." am: b244bfa4d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574005

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ff4e8c5b7ec0cf8cf32cdb9f9728fe53c7a7f28
 2021-02-16 15:22:17 +00:00
Cody Kesting
5cf38e3d13 Merge "Acquire WakeLock while processing Gateway messages." am: 864b62491d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571012

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b0d112a150a7fcda68b91a2f590a30fbf80245e
 2021-02-16 15:20:08 +00:00
Treehugger Robot
fc00dda2e9 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: fcf6560011 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1588961

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b9d7ed1e439f69ea73015173759c5ca2ee1ac89
 2021-02-16 15:16:27 +00:00
Kohsuke Yatoh
c2008e8aac Add FontManager#updateFontFamily() API. 
Bug: 179103383
Test: atest CtsGraphicsTestCases:FontFamilyUpdateRequestTest
Test: atest CtsGraphicsTestCases:FontFileUpdateRequestTest
Test: atest CtsGraphicsTestCases:FontManagerTest
Test: atest FrameworksServicesTests:UpdatableFontDirTest
Test: atest UpdatableSystemFontTest
Change-Id: I0103784c72d60567675daf73e95e4d716f091e4a
 2021-02-16 07:06:33 -08:00
Cody Kesting
b244bfa4d6 Merge "Use WakeupMesage for delayed events in VcnGatewayConnection." 2021-02-16 14:54:30 +00:00
Cody Kesting
864b62491d Merge "Acquire WakeLock while processing Gateway messages." 2021-02-16 14:54:16 +00:00
Treehugger Robot
fcf6560011 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" 2021-02-16 14:50:57 +00:00
TreeHugger Robot
15c4d3210a Merge "dumpsys: Print total DMA-BUFs exported from the DMA-BUF heaps framework" into sc-dev 2021-02-16 14:50:24 +00:00
Eran Messeri
b1c5353937 Merge "Utilize context user ID for canAdminGrantSensorsPermissions" into sc-dev 2021-02-16 14:41:10 +00:00
Alex Johnston
66e3908e39 Allow PO to enable network logging on work profile 
Changes
* The profile owner can enable network logging
  on the work profile.
* The network logs only include work profile
  network activity (not personal profile activity).

Bug: 170460270
Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest
      atest com.android.server.devicepolicy.NetworkEventTest
      atest com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testNetworkLogging
      atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testNetworkLogging
      atest com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithTwoUsers
      atest com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
      atest com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLogging_multipleBatches
Change-Id: I4727ba7cbc62f9cd187f82a9527f0475345fd555
Merged-In: I4727ba7cbc62f9cd187f82a9527f0475345fd555
 2021-02-16 14:22:02 +00:00
TreeHugger Robot
56dac4ccf4 Merge changes I12c7de63,I241cf0fc into sc-dev 
* changes:
  Update handling of Remote Control Passthrough messages
  Remove RECORD_TV_SCREEN handling from playback device
 2021-02-16 14:17:41 +00:00
Treehugger Robot
109836d6b6 Merge "Prevent tests with reboot from running during presubmit" am: 6916f91f55 am: 131d03d6bf am: 057bac2724 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I363e8968ca7fc436228458a5239b909d8d156105
 2021-02-16 13:27:13 +00:00
Benjamin Franz
4c5134f3da Merge "Add versioning to app compat framework" am: 80bbdfd100 am: 4fb9af6ced am: 8964ef6743 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585009

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d349a5f76f496503e328a4fc70e051a2ccca2b6
 2021-02-16 13:26:45 +00:00
Nathalie Le Clair
c304c1624d Merge "Use up-to-date power status in DeviceSelectAction" into sc-dev 2021-02-16 12:56:36 +00:00
Treehugger Robot
057bac2724 Merge "Prevent tests with reboot from running during presubmit" am: 6916f91f55 am: 131d03d6bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e0bd75b8a65fc39288a6f92e8d5473060ccbd95
 2021-02-16 12:51:51 +00:00
Benjamin Franz
8964ef6743 Merge "Add versioning to app compat framework" am: 80bbdfd100 am: 4fb9af6ced 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585009

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14b38edb7136852c5ecf78e0a4ad0266c77a453a
 2021-02-16 12:51:34 +00:00
Eran Messeri
2fa704ebe2 Utilize context user ID for canAdminGrantSensorsPermissions 
Remove, from the system API surface, the canAdminGrantSensorsPermissionsForUser
method, leaving only canAdminGrantSensorsPermissions.

In canAdminGrantSensorsPermissions, get the user ID from the context.

This means callers that need to find out the permission grant state for
a particular user would have to construct a context object for that
user.

Bug: 179690270
Bug: 170627643
Test: DeviceOwnerTest#testDeviceOwnerProvisioning ManagedProvisioningTests:com.android.managedprovisioning.parser.ExtrasProvisioningDataParserTest ManagedProvisioningTests:com.android.managedprovisioning.parser.PropertiesProvisioningDataParserTest ManagedProvisioningTests:com.android.managedprovisioning.model.ProvisioningParamsTest android.devicepolicy.cts.DevicePolicyManagerTest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAdminControlOverSensorPermissionGrantsDefault com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testAdminControlOverSensorPermissionGrantsDefault com.android.cts.devicepolicy.DeviceOwnerTest#testAdminControlOverSensorPermissionGrantsDefault com.android.cts.devicepolicy.MixedProfileOwnerTest#testAdminControlOverSensorPermissionGrantsDefault
Change-Id: I118f642c15b3f9848ff97d13e1e32b3bd5dba63d
 2021-02-16 12:42:59 +00:00
Marvin Ramin
d4a3a5ced5 Update handling of Remote Control Passthrough messages 
Never respond <Feature Abort>[Unrecognized Opcode] in cases where <User
Control Pressed> or <User Control Released> cannot be handled.

Bug: 180103617
Test: atest com.android.server.hdmi
Change-Id: I12c7de639ac31a9ae381c3706f64b53e3e92d71c
 2021-02-16 13:38:21 +01:00