Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
629,507 Commits 3 Branches 0 Tags
cd0cf05bf0feea07f8548859e06e7ebeb0eb3e25
Commit Graph

629507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yohei Yukawa
cd0cf05bf0 Merge "Revert "Avoid IME restart for configChanges"" into sc-dev am: b2e45a2dc6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13713406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c3745ca21c85eac1fe672302a215f1603f20579
 2021-03-01 18:45:38 +00:00
Heemin Seog
8f66a30f64 [automerger skipped] Merge "DO NOT MERGE Intercept back button on user switcher screen" into rvc-qpr-dev am: de0869335a am: 3ad96cbfe1 -s ours am: 95ce7d88dd -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: Ie0f3eb02db8f5d981c27ba643643ea6eebf03fae
 2021-03-01 18:44:57 +00:00
Heemin Seog
6a878323e9 [automerger skipped] DO NOT MERGE Intercept back button on user switcher screen am: a287650f94 am: c76299428e -s ours am: 75af6c8108 -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: I1377c8b0c019d549485cee125d617f84f06cd62a
 2021-03-01 18:44:53 +00:00
TreeHugger Robot
cb733ca1d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1e3abbf022 -s ours am: 0a66a75b91 -s ours am: 0864b25857 -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: Ie1b60441d3de628fb6d7e9a1a5eb8de153077c13
 2021-03-01 18:44:28 +00:00
Lee Shombert
f7a10927ee Merge "Fix the PMS live computer" into sc-dev am: 3c039830a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13720012

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ca2c265f42553d9d893c3fb082bee16bd76cf25
 2021-03-01 18:43:34 +00:00
Yohei Yukawa
b2e45a2dc6 Merge "Revert "Avoid IME restart for configChanges"" into sc-dev 2021-03-01 18:30:36 +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
Lee Shombert
3c039830a4 Merge "Fix the PMS live computer" into sc-dev 2021-03-01 18:17:09 +00:00
Keun-young Park
81b13089e2 Merge "Revert "Configure privapp perms for car activity resolver"" 2021-03-01 18:10:31 +00:00
Amy Zhang
f3f72d66a2 Fix the typo in Tuner JNI of onScanMessageExt_1_1.onPriorityReported am: a1649935f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13702506

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ff9ef67175417e931f721655577ac272023a6c2
 2021-03-01 18:10:15 +00:00
Greg Daniel
02bfc193af Merge "Remove flushAndSubit from SkiaPipeline renderFrame." into sc-dev am: e280ab9e0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13718433

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac05691e1c780732def2dc61513510d8e298fb6f
 2021-03-01 18:09:52 +00:00
Zimuzo Ezeozue
aaa782cd7a Merge "Rename onGetAnrDelayMillis to onAnrDelayStarted" into sc-dev am: cebc566145 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13699632

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f2397ee0ff7ca3f859bffe7e5e70e1bf634d079
 2021-03-01 18:09:27 +00:00
Nataniel Borges
6f478868e8 Merge "Open IME tests should run only in 0 degrees" into sc-dev am: f765ca7883 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13714651

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe7c56f9fa9c18fd6e99335fda6e709172f11dfd
 2021-03-01 18:08:12 +00:00
TreeHugger Robot
e5b8c7cafd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 32ab3f75f6 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25ae0f405272d05912d55348e1b034a0be2a1227
 2021-03-01 18:07:47 +00:00
TreeHugger Robot
2d9f8633d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 67752d1295 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4543d34d9dce28716be69b5ea52522ce283c51ab
 2021-03-01 18:07:30 +00:00
Felipe Leme
f530acf668 Merge "2 minor DevicePolicyManagerService improvements." into sc-dev am: d7cda89ca5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13712126

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1338f60016adf6ebd621febb7430b96051aa22a8
 2021-03-01 18:07:17 +00:00
TreeHugger Robot
66afa50175 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6e2cd62232 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d84049dce366d69e5a627a2ccf0a5a54d7d79c7
 2021-03-01 18:06:59 +00:00
Felipe Leme
ec7d92a735 Merge "Fixed createAndManageUser() for headless system user mode." into sc-dev am: f2a7576696 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13679504

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84048171bc1acf78920c2a63dea393c7761938ae
 2021-03-01 18:04:32 +00:00
Anton Hansson
b00b63b16a Merge "Add more test-cases for <extension-sdk>" into sc-dev am: f288c41d52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13690793

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0383db0a5b75298aa6b012d9e7949439b8c40945
 2021-03-01 18:03:27 +00:00
Victor Chang
6b6104564d Merge "Revert "Clean up LogicalDisplayMapper"" into sc-dev am: 03c49c1324 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13714652

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I411d1b949b231c460cee9a188f22d9634db7fc78
 2021-03-01 18:03:10 +00:00
Hui Yu
ef1986f495 Merge "Call new API setTemporaryAppAllowlist() and specify temp-allowlist reasonCode." into sc-dev am: 2533037dc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13705796

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7117c45dc6dce542d72983885bb17fdd3ba50fb0
 2021-03-01 18:02:38 +00:00
Bill Yi
5f39c95dec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 41e859a977 -s ours am: 6d5cc3989b -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: I77e0dcf8378f5ec63df1f36482d0a80c973f8109
 2021-03-01 18:02:02 +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
Bill Yi
5f6c21ddbe Merge changes from topic "presubmit-am-e4fb35a92efe4ced89230034ac1bdb98" into sc-dev am: 6cdb4f4ff5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13723060

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58f83e849a45dc8713612ba1f181d0ccea426dd7
 2021-03-01 18:01:50 +00:00
Bill Yi
556286a73f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 09233975ca am: cc55b8fedb -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: I28acf6cc5635d7606bdab276a9fe77476495cdb2
 2021-03-01 18:01:46 +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
Ruslan Tkhakokhov
ac5580350c Merge "Update D2D logic in line with new opt-out rules" into sc-dev am: b56fc740bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13699589

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2236b3d5aec63ff3f1e4540f33c8e11b246009d
 2021-03-01 18:00:48 +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
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
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
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
Zimuzo Ezeozue
4005dd8a79 resolve merge conflicts of 7df4e1c5a4 
resolve merge conflicts of
"Add API to notify the system_server when app is blocked on I/O"
to master

Change-Id: Ie7a7be2a5b8557a2cdd3fbc1a6a37622b29535be
 2021-03-01 15:55:14 +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
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