Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
637,162 Commits 3 Branches 0 Tags
00175150f1fbcb2811775d00e8dff174d167d349
Commit Graph

637162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rambo Wang
00175150f1 Merge "Change Nci to CellInfo.UNAVAILABLE_LONG" am: 5619ee97bf am: eb52e08c30 am: 2067201fb1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676432

Change-Id: If082dba227e179d7e83c7521a5a88f19e4ac1d38
 2021-04-22 00:20:05 +00:00
TreeHugger Robot
c8bd865328 Merge "Add the REGISTRATION_TECH_NR Tech type" into sc-dev 2021-04-22 00:15:46 +00:00
Rambo Wang
2067201fb1 Merge "Change Nci to CellInfo.UNAVAILABLE_LONG" am: 5619ee97bf am: eb52e08c30 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676432

Change-Id: Ib7ad3a9b44399c673fae3f0b2df9ec3fcabed398
 2021-04-21 23:57:45 +00:00
Kevin Han
ef3f84023b Merge "Unhibernate apps on boot that are not force-stopped" into sc-dev 2021-04-21 23:55:30 +00:00
Treehugger Robot
1bff978184 Merge "Fix grammatical error in LayoutAnimationController documentation." am: 84fdb3b19f am: 07a7231bc8 am: 1c166fa20d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1680106

Change-Id: I7be25e32f785c30b21d8b286be38c8907524b9dd
 2021-04-21 23:50:20 +00:00
Treehugger Robot
0f3f55bb1c [automerger skipped] Merge "DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base" am: 0cfaf8aa1c am: a184c0e820 am: 789850e9b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I72b6a3018c353419d0e62ccb59fa5b0b66455c81
 2021-04-21 23:49:48 +00:00
Bob Badour
f41ba6b483 [automerger skipped] DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base am: 268090cd09 am: 48a93af680 am: cac2f91285 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf8d17bf5b4d6ce39bf39b4dbc334b2ad2800cf7
 2021-04-21 23:49:32 +00:00
Rambo Wang
eb52e08c30 Merge "Change Nci to CellInfo.UNAVAILABLE_LONG" am: 5619ee97bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676432

Change-Id: Ia7b8354928340e8ba89674eadf4d804195e43e29
 2021-04-21 23:30:56 +00:00
TreeHugger Robot
b0d7c12dd2 Merge "Add null pointer check to getStopped" into sc-dev 2021-04-21 23:27:12 +00:00
Alexander Dorokhine
5681f7c05f Merge "Update framework from jetpack." into sc-dev 2021-04-21 23:17:21 +00:00
Treehugger Robot
1c166fa20d Merge "Fix grammatical error in LayoutAnimationController documentation." am: 84fdb3b19f am: 07a7231bc8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1680106

Change-Id: I456c07ee5beeceb6d9581ed2dc0313f4ba9fadd1
 2021-04-21 23:07:23 +00:00
Treehugger Robot
789850e9b7 Merge "DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base" am: 0cfaf8aa1c am: a184c0e820 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682054

Change-Id: I32736053135d6bd19e9cceb6cf512105020a8a85
 2021-04-21 23:07:01 +00:00
Bob Badour
cac2f91285 DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base am: 268090cd09 am: 48a93af680 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682054

Change-Id: I9ee0a197b381a370bdbfafd71f4ceb200acbf8d2
 2021-04-21 23:06:57 +00:00
Sergey Nikolaienkov
f4c17d8f4c Remove WmShell's min_sdk and lint-baseline.xml 
Removing min_sdk_version for WmShell since it's not meant to be backward
compatible.
Removing lint-baseline.xml which only contains "NewApi" errors, that
won't be generated now, since min_sdk_version has been removed.

Bug: 182759603
Test: make WmShell
Change-Id: I38e4814581d6c6a8aeb8d66b1b554a5bac331f68
 2021-04-21 23:00:26 +00:00
Rambo Wang
5619ee97bf Merge "Change Nci to CellInfo.UNAVAILABLE_LONG" 2021-04-21 22:53:57 +00:00
Kohsuke Yatoh
dcb3fd9182 Merge "Wait more time for activity start." into sc-dev 2021-04-21 22:51:58 +00:00
Jing Ji
8ef3eaa159 Merge "Do not set the group and cpuset for the OomAdjuster thread" into sc-dev 2021-04-21 22:47:26 +00:00
Treehugger Robot
07a7231bc8 Merge "Fix grammatical error in LayoutAnimationController documentation." am: 84fdb3b19f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1680106

Change-Id: Id41e67df45954011ec4bc0c98a800a56359902d6
 2021-04-21 22:45:49 +00:00
TreeHugger Robot
6c0a479e62 Merge "Synthesize app PendingIntents rather than wrap them" into sc-dev 2021-04-21 22:41:22 +00:00
Jeff Sharkey
c1b024d280 Merge "Pass AttributionSource to AdapterService methods." into sc-dev 2021-04-21 22:40:20 +00:00
Treehugger Robot
84fdb3b19f Merge "Fix grammatical error in LayoutAnimationController documentation." 2021-04-21 22:37:17 +00:00
Treehugger Robot
a184c0e820 Merge "DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base" am: 0cfaf8aa1c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682054

Change-Id: I178126b538cea0c747d76569f939e16dd8f835f8
 2021-04-21 22:35:41 +00:00
Bob Badour
48a93af680 DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base am: 268090cd09 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682054

Change-Id: If40ef54914e5565aa2b535906ddc2cf6763b53e5
 2021-04-21 22:32:54 +00:00
TreeHugger Robot
de70530fd6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-21 22:25:27 +00:00
Jeff Sharkey
d4b3fcac16 Merge "Annotations for Bluetooth broadcast intents." into sc-dev 2021-04-21 22:23:48 +00:00
TreeHugger Robot
373fafb24b Merge "Camera: Enable camera extension latency range queries" into sc-dev 2021-04-21 22:23:35 +00:00
Rob Carr
c2d41154f0 Merge "View: Expose gatherTransparentRegion" into sc-dev 2021-04-21 22:18:11 +00:00
Lucas Dupin
2a8031d889 Merge "Fix typos in documentation" into sc-dev 2021-04-21 22:17:42 +00:00
TreeHugger Robot
0b99af47c5 Merge "Addresses setRequireUserAction API feedback" into sc-dev 2021-04-21 22:11:23 +00:00
Pinyao Ting
a51996aa48 Merge "Replace oneway shortcut api with AndroidFuture" into sc-dev 2021-04-21 22:10:19 +00:00
Andy Hung
7f4e3745ae Merge "Audio: Add ENCODING_DRA" into sc-dev 2021-04-21 22:08:43 +00:00
Nazanin Bakhshi
1d1c733350 Merge "Security fix: enforce read privilege permission to check package privileges in TelephonyManager" into sc-dev 2021-04-21 22:04:04 +00:00
Sally Yuen
93595946da Merge "Add prefetch result to a11y tracing" into sc-dev 2021-04-21 22:02:07 +00:00
TreeHugger Robot
c9a99af53a Merge "Create a callback method to invoke when the hotword detector is restarted." into sc-dev 2021-04-21 22:02:01 +00:00
Treehugger Robot
0cfaf8aa1c Merge "DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base" 2021-04-21 21:58:38 +00:00
Hall Liu
cd1a5490ec Merge "Remove fixed grant of READ_PHONE_STATE and cleanup" into sc-dev 2021-04-21 21:42:00 +00:00
Treehugger Robot
9341d83295 Merge "add large format media sizes" am: 62bc98dd54 am: 33cc3922c1 am: 016db3711a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574587

Change-Id: Id294d2edc0f8d84a65f1a47318c2a23a75d87fd9
 2021-04-21 21:37:14 +00:00
Steven Moreland
3b44e58145 Merge "ServiceManagerNative: update for updatableViaApex" am: 0da4dcceea am: b763d9fbb6 am: 50dda4bb15 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682064

Change-Id: I7f25599c5ebe6759f7001194d401e0bbc191ffd9
 2021-04-21 21:36:38 +00:00
TreeHugger Robot
19fb732416 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-21 21:17:25 +00:00
Treehugger Robot
016db3711a Merge "add large format media sizes" am: 62bc98dd54 am: 33cc3922c1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574587

Change-Id: Ib29f14dcaf094f12f957d950a382d5b8a232ada5
 2021-04-21 21:14:44 +00:00
Steven Moreland
50dda4bb15 Merge "ServiceManagerNative: update for updatableViaApex" am: 0da4dcceea am: b763d9fbb6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682064

Change-Id: Ib717ea616df7947cb1b14fc583e60ea3c8407529
 2021-04-21 21:14:24 +00:00
TreeHugger Robot
b2d2a8f023 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4e609e9f70 -s ours am: c6ae4077de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14f64239493895729d2ab0ba51f1bbde77f4d683
 2021-04-21 21:05:13 +00:00
TreeHugger Robot
9e29fa66bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 432176aa5d -s ours am: f74aca8496 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iabb16f065a111ec447b345ab44ee76b0e2c4eeb6
 2021-04-21 21:05:02 +00:00
TreeHugger Robot
2665c7658d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 756f699986 -s ours am: c978b11ec3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f5c57cf01e70f7928e20b6db3f1213942d5ee9d
 2021-04-21 21:04:48 +00:00
Nate Myren
f7c1b2721e Merge "Change Permission Group methods to be callback, gate behind perm" into sc-dev 2021-04-21 21:01:05 +00:00
Dmitri Plotnikov
05b84c584e Merge "Save power component names in the summary parcel for MeasuredEnergySnapshot" into sc-dev 2021-04-21 20:58:32 +00:00
Bob Badour
268090cd09 DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base 
Added SPDX-license-identifier-Apache-2.0 to:
  core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests2/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk
  core/tests/overlaytests/host/test-apps/SignatureOverlay/Android.mk
  core/tests/overlaytests/host/test-apps/UpdateOverlay/Android.mk
  location/tests/Android.bp
  packages/CarSystemUI/tests/Android.mk
  packages/SystemUI/tests/Android.mk
  packages/overlays/AccentColorAmethystOverlay/Android.mk
  packages/overlays/AccentColorAquamarineOverlay/Android.mk
  packages/overlays/AccentColorBlackOverlay/Android.mk
  packages/overlays/AccentColorCarbonOverlay/Android.mk
  packages/overlays/AccentColorCinnamonOverlay/Android.mk
  packages/overlays/AccentColorGreenOverlay/Android.mk
  packages/overlays/AccentColorOceanOverlay/Android.mk
  packages/overlays/AccentColorOrchidOverlay/Android.mk
  packages/overlays/AccentColorPaletteOverlay/Android.mk
  packages/overlays/AccentColorPurpleOverlay/Android.mk
  packages/overlays/AccentColorSandOverlay/Android.mk
  packages/overlays/AccentColorSpaceOverlay/Android.mk
  packages/overlays/AccentColorTangerineOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationCornerOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationDoubleOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationHoleOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationNarrowOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationTallOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationWaterfallOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationWideOverlay/Android.mk
  packages/overlays/FontNotoSerifSourceOverlay/Android.mk
  packages/overlays/IconPackCircularAndroidOverlay/Android.mk
  packages/overlays/IconPackCircularLauncherOverlay/Android.mk
  packages/overlays/IconPackCircularSettingsOverlay/Android.mk
  packages/overlays/IconPackCircularSystemUIOverlay/Android.mk
  packages/overlays/IconPackCircularThemePickerOverlay/Android.mk
  packages/overlays/IconPackFilledAndroidOverlay/Android.mk
  packages/overlays/IconPackFilledLauncherOverlay/Android.mk
  packages/overlays/IconPackFilledSettingsOverlay/Android.mk
  packages/overlays/IconPackFilledSystemUIOverlay/Android.mk
  packages/overlays/IconPackFilledThemePickerOverlay/Android.mk
  packages/overlays/IconPackKaiAndroidOverlay/Android.mk
  packages/overlays/IconPackKaiLauncherOverlay/Android.mk
  packages/overlays/IconPackKaiSettingsOverlay/Android.mk
  packages/overlays/IconPackKaiSystemUIOverlay/Android.mk
  packages/overlays/IconPackKaiThemePickerOverlay/Android.mk
  packages/overlays/IconPackRoundedAndroidOverlay/Android.mk
  packages/overlays/IconPackRoundedLauncherOverlay/Android.mk
  packages/overlays/IconPackRoundedSettingsOverlay/Android.mk
  packages/overlays/IconPackRoundedSystemUIOverlay/Android.mk
  packages/overlays/IconPackRoundedThemePickerOverlay/Android.mk
  packages/overlays/IconPackSamAndroidOverlay/Android.mk
  packages/overlays/IconPackSamLauncherOverlay/Android.mk
  packages/overlays/IconPackSamSettingsOverlay/Android.mk
  packages/overlays/IconPackSamSystemUIOverlay/Android.mk
  packages/overlays/IconPackSamThemePickerOverlay/Android.mk
  packages/overlays/IconPackVictorAndroidOverlay/Android.mk
  packages/overlays/IconPackVictorLauncherOverlay/Android.mk
  packages/overlays/IconPackVictorSettingsOverlay/Android.mk
  packages/overlays/IconPackVictorSystemUIOverlay/Android.mk
  packages/overlays/IconPackVictorThemePickerOverlay/Android.mk
  packages/overlays/IconShapeHeartOverlay/Android.mk
  packages/overlays/IconShapePebbleOverlay/Android.mk
  packages/overlays/IconShapeRoundedRectOverlay/Android.mk
  packages/overlays/IconShapeSquareOverlay/Android.mk
  packages/overlays/IconShapeSquircleOverlay/Android.mk
  packages/overlays/IconShapeTaperedRectOverlay/Android.mk
  packages/overlays/IconShapeTeardropOverlay/Android.mk
  packages/overlays/IconShapeVesselOverlay/Android.mk
  packages/overlays/NavigationBarMode2ButtonOverlay/Android.mk
  packages/overlays/NavigationBarMode3ButtonOverlay/Android.mk
  packages/overlays/NavigationBarModeGesturalOverlay/Android.mk
  packages/overlays/NavigationBarModeGesturalOverlayExtraWideBack/Android.mk
  packages/overlays/NavigationBarModeGesturalOverlayNarrowBack/Android.mk
  packages/overlays/NavigationBarModeGesturalOverlayWideBack/Android.mk
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  tests/Camera2Tests/CameraToo/Android.mk
  tests/Camera2Tests/CameraToo/tests/Android.mk
  tests/Camera2Tests/SmartCamera/SimpleCamera/Android.mk
  tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk
  tests/CanvasCompare/Android.mk
  tests/FlickerTests/test-apps/Android.bp
  tests/LockTaskTests/Android.mk
  tests/SoundTriggerTests/Android.mk
  tools/aapt2/integration-tests/MergeOnlyTest/App/Android.mk
  tools/aapt2/integration-tests/NamespaceTest/App/Android.mk
  tools/aapt2/integration-tests/NamespaceTest/Split/Android.mk
  tools/fonts/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I90231075f135176668586b903f2c85ec350fd527
 2021-04-21 20:55:12 +00:00
TreeHugger Robot
037aa87589 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 58141584ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f1c1b12c959b2834c66e8054d6c4721dad26bb9
 2021-04-21 20:55:11 +00:00
TreeHugger Robot
62951ca137 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 026dd3553c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44bc294652c03afe08f29c3f7f6d96ca1b79a13f
 2021-04-21 20:54:20 +00:00
Treehugger Robot
33cc3922c1 Merge "add large format media sizes" am: 62bc98dd54 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574587

Change-Id: Id2828ad981cae8d39d238a9f66416ce13fc6efea
 2021-04-21 20:53:59 +00:00