Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
626,668 Commits 3 Branches 0 Tags
76545798d7f74006271ab20247fea4e47f4fa638
Commit Graph

626668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kholoud Mohamed
76545798d7 Merge "Expose a testAPI in CrossProfileApps" into sc-dev 2021-03-01 19:37:15 +00:00
Matt Casey
7fbe02a1dd Merge "Image state restoration for LongScreenshotActivity" into sc-dev 2021-03-01 19:26:42 +00:00
Evan Rosky
ee971e5648 Merge "Fix some bugs in input rotation" into sc-dev 2021-03-01 19:20:50 +00:00
Treehugger Robot
55f3b80e97 [automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: 19f7526c3e am: dc8de2ce5a am: c16285c27c -s ours 
am skip reason: Change-Id I823e093d400903202e5535188639dddd1a1f78a9 with SHA-1 354603079c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1af235deabc2a168c38052b11188145e23e6dd5f
 2021-03-01 19:05:03 +00:00
Treehugger Robot
c16285c27c Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: 19f7526c3e am: dc8de2ce5a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1609976

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf02c4122be0d2c0b7fd2d530adc891e06a5f0b7
 2021-03-01 18:44:09 +00:00
Kweku Adams
94691f3cbd Merge "Disallow long regular jobs in Doze and battery saver." into sc-dev 2021-03-01 18:38:39 +00:00
Kholoud Mohamed
93d631e2f0 Merge "Add testAPIs in ContentCaptureManager" into sc-dev 2021-03-01 18:37:03 +00:00
Hui Yu
69d8c25518 Merge "Specify temp-allowlist reasonCode while calling addPowerSaveTempWhitelistApp()." into sc-dev 2021-03-01 18:35:24 +00:00
Automerger Merge Worker
e8c0bae0e5 Merge "[automerger skipped] Merge "Avoid TransferPipe for local dumpCacheInfo calls" into rvc-qpr-dev am: d8c231ef99 am: fb633ef937 -s ours" into sc-dev 2021-03-01 18:30:56 +00:00
Yohei Yukawa
b2e45a2dc6 Merge "Revert "Avoid IME restart for configChanges"" into sc-dev 2021-03-01 18:30:36 +00:00
Collin Fijalkovich
fb114abb63 [automerger skipped] Merge "Avoid TransferPipe for local dumpCacheInfo calls" into rvc-qpr-dev am: d8c231ef99 am: fb633ef937 -s ours 
am skip reason: Change-Id I1e4ab8e1d09b98b379d81079fd26ff2129b5b65a with SHA-1 bde9bc3635 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib653eafe73190ccad357a15a26fad6f9fed087d5
 2021-03-01 18:30:17 +00:00
Heemin Seog
95ce7d88dd [automerger skipped] Merge "DO NOT MERGE Intercept back button on user switcher screen" into rvc-qpr-dev am: de0869335a am: 3ad96cbfe1 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I746794a634d5fe72f1cccd937199d444e4659083
 2021-03-01 18:29:39 +00:00
Heemin Seog
75af6c8108 [automerger skipped] DO NOT MERGE Intercept back button on user switcher screen am: a287650f94 am: c76299428e -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e545b9c2e58643df20c9efb1e5b006de7db751c
 2021-03-01 18:29:11 +00:00
Taran Singh
712fc24a34 Revert "Avoid IME restart for configChanges" 
Revert "Add cts for InputMethodService configChanges"

Revert submission 13417792-b/167948419

Reason for revert: Causes bugs like b/181195100
Reverted Changes:
Iff88b768c:Avoid IME restart for configChanges
Ib7ce13340:Add cts for InputMethodService configChanges

Bug: 167948419
Fix: 181195100
Change-Id: I36bca545b09b4f870560964ec61fa6bb344fceaf
 2021-03-01 18:28:10 +00:00
TreeHugger Robot
0864b25857 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1e3abbf022 -s ours am: 0a66a75b91 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07e7779d5da6f9d79c9089d73aa2fe0ccc441809
 2021-03-01 18:27:44 +00:00
Collin Fijalkovich
fb633ef937 Merge "Avoid TransferPipe for local dumpCacheInfo calls" into rvc-qpr-dev am: d8c231ef99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13701625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45b840db0568687282de097e1e43a0a83e5176f0
 2021-03-01 18:23:26 +00:00
Lee Shombert
3c039830a4 Merge "Fix the PMS live computer" into sc-dev 2021-03-01 18:17:09 +00:00
Collin Fijalkovich
d8c231ef99 Merge "Avoid TransferPipe for local dumpCacheInfo calls" into rvc-qpr-dev 2021-03-01 18:05:49 +00:00
Heemin Seog
3ad96cbfe1 Merge "DO NOT MERGE Intercept back button on user switcher screen" into rvc-qpr-dev am: de0869335a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13689637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01f2dcbbb43e75cecf7d21dd9967b07087aa8a55
 2021-03-01 18:01:59 +00:00
Heemin Seog
c76299428e DO NOT MERGE Intercept back button on user switcher screen am: a287650f94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13689637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf68c025d3fab83724ed802fd99826668cf81bf3
 2021-03-01 18:01:41 +00:00
Amy Zhang
a1649935f1 Fix the typo in Tuner JNI of onScanMessageExt_1_1.onPriorityReported 
Test: atest android.media.tv.tuner.cts
Bug: 181242574
Change-Id: Ie1348a0e2489160975d769c21429b971accfb2ea
 2021-03-01 17:58:09 +00:00
Treehugger Robot
dc8de2ce5a Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: 19f7526c3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1609976

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f84b0a5fc4caf145470eb136efacc497a6661e4
 2021-03-01 17:42:26 +00:00
Greg Daniel
e280ab9e0d Merge "Remove flushAndSubit from SkiaPipeline renderFrame." into sc-dev 2021-03-01 17:39:11 +00:00
Zimuzo Ezeozue
cebc566145 Merge "Rename onGetAnrDelayMillis to onAnrDelayStarted" into sc-dev 2021-03-01 17:28:34 +00:00
Heemin Seog
de0869335a Merge "DO NOT MERGE Intercept back button on user switcher screen" into rvc-qpr-dev 2021-03-01 17:28:20 +00:00
Matt Casey
2bb3ca0c85 Image state restoration for LongScreenshotActivity 
- When long screenshot is acquired, save image to a temporary file.
- When restoring state, read in that bitmap.
- Moved bitmap export code from ScrollCaptureController to
  LongScreenshotActivity because it needs to be able to export any
  drawable regardless of source.
- Currently deleting the temporary file onDestroy.

Bug: 181087631
Test: Enable "don't keep activities" debug setting. Take long
screenshot, go to overview and return. Rotate UI. Verify that image
restores along with crop bounds and export still works properly.

Change-Id: I892ad78025c818c8c65d16f2844daa955cc0b005
 2021-03-01 12:25:03 -05:00
TreeHugger Robot
0a66a75b91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1e3abbf022 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3da87a730af4b63b72948c4a277db06e82439c00
 2021-03-01 17:23:38 +00:00
Nataniel Borges
f765ca7883 Merge "Open IME tests should run only in 0 degrees" into sc-dev 2021-03-01 17:10:18 +00:00
TreeHugger Robot
32ab3f75f6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-01 17:02:36 +00:00
TreeHugger Robot
67752d1295 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-01 16:58:43 +00:00
Felipe Leme
d7cda89ca5 Merge "2 minor DevicePolicyManagerService improvements." into sc-dev 2021-03-01 16:49:24 +00:00
TreeHugger Robot
1e3abbf022 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-01 16:48:23 +00:00
TreeHugger Robot
6e2cd62232 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-01 16:47:44 +00:00
Felipe Leme
f2a7576696 Merge "Fixed createAndManageUser() for headless system user mode." into sc-dev 2021-03-01 16:46:04 +00:00
Anton Hansson
f288c41d52 Merge "Add more test-cases for <extension-sdk>" into sc-dev 2021-03-01 16:38:43 +00:00
Victor Chang
03c49c1324 Merge "Revert "Clean up LogicalDisplayMapper"" into sc-dev 2021-03-01 16:34:16 +00:00
Hui Yu
2533037dc5 Merge "Call new API setTemporaryAppAllowlist() and specify temp-allowlist reasonCode." into sc-dev 2021-03-01 16:30:58 +00:00
Treehugger Robot
19f7526c3e Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" 2021-03-01 16:25:43 +00:00
Bill Yi
6d5cc3989b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 41e859a977 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3464fa758b8d45d6ec53da94a9602ad0ddfad9f
 2021-03-01 16:04:13 +00:00
kholoud mohamed
28913aa2f9 Add testAPIs in ContentCaptureManager 
Added the following static testAPIs to replace
the usage of adb commands in cts/gts tests:
* resetTemporaryService
* setTemporaryService
* setDefaultServiceEnabled
These APIs are static because by default ContentCaptureManager
isn't available until it's enabled using these APIs.

Test: Confirmed that the APIs are accessible in CTS tests.
Bug: 180328483
Change-Id: I0a94d90b509e1d2f695556955d85d27acab19ae9
 2021-03-01 15:43:20 +00:00
Bill Yi
6cdb4f4ff5 Merge changes from topic "presubmit-am-e4fb35a92efe4ced89230034ac1bdb98" into sc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 09233975ca
  Import translations. DO NOT MERGE ANYWHERE
 2021-03-01 15:34:22 +00:00
Bill Yi
41e859a977 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-01 15:34:22 +00:00
Bob Badour
a830943f6c [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base 
Added SPDX-license-identifier-Apache-2.0 to:
  location/tests/Android.bp
  services/api/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  tests/FlickerTests/test-apps/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I823e093d400903202e5535188639dddd1a1f78a9
Merged-in: I823e093d400903202e5535188639dddd1a1f78a9
 2021-03-01 15:25:02 +00:00
kholoud mohamed
baa7b228fa Expose a testAPI in CrossProfileApps 
Exposed canConfigureInteractAcrossProfiles as
a testAPI.

Test: confirmed the API is callable in CTS tests.
Bug: 180328483
Change-Id: I7c2b5ae986ca8ce6771d814bf7a3568b9896e82f
 2021-03-01 15:20:07 +00:00
Ruslan Tkhakokhov
b56fc740bb Merge "Update D2D logic in line with new opt-out rules" into sc-dev 2021-03-01 14:53:36 +00:00
Greg Daniel
be2803a817 Remove flushAndSubit from SkiaPipeline renderFrame. 
Previously we would submit a command buffer for the
frames draws and then immediately submit a second
command buffer that had no commands and just an attached
semaphore. This merges those two submit calls into Skia
into one call.

Test: manual running of system of benches
Bug: 175913056

Change-Id: If0d054960de8b459814cbfa9289756f8ee9d4a93
(cherry picked from commit f16ba60194)
 2021-03-01 13:56:45 +00:00
Bill Yi
a2793870d9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaaee6bce433f32e71f5ff1934e19854dea98fab7
 2021-03-01 13:29:54 +00:00
Victor Chang
8085fe75d1 Revert "Clean up LogicalDisplayMapper" 
Revert submission 13575048-clean_ldm

Reason for revert: http://b/181537022
Reverted Changes:
I69c3478b4:Adjust jumbojack config to fit latest display layo...
I72a4eb667:Clean up LogicalDisplayMapper

Change-Id: I392816dd3870bd1ab969c06e796977a9d39bafda
 2021-03-01 13:21:54 +00:00
Zimuzo Ezeozue
7df4e1c5a4 Merge "Add API to notify the system_server when app is blocked on I/O" into sc-dev 2021-03-01 12:41:24 +00:00
Ming-Shin Lu
ea1be96732 Merge "Remove duplicated startInputUncheckedLocked invocation" into sc-dev 2021-03-01 12:21:01 +00:00