Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
651,480 Commits 3 Branches 0 Tags
d7fbb1fe985aaaeb4b6ef31c12b8eecdec4cb211
Commit Graph

651480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Suren Baghdasaryan
d7fbb1fe98 Merge "ActivityManagerService: add new lmkd kill reason" am: aebf935349 am: 326599cf76 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768611

Change-Id: Ic0c3fc46155b3d3845a2e82948147ed52248e87c
 2021-07-16 16:55:22 +00:00
Nate Myren
65f5d4f3e6 Merge "Null safe package name in AppOps writeState" into sc-dev am: 0abd07b3fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301695

Change-Id: I016f141621cc890bb015d6c08688897dd7d47389
 2021-07-16 16:51:41 +00:00
Nate Myren
0d196dc422 Merge "Correctly set trusted AttributionSource in RecognitionService" into sc-dev am: 0669fb0bfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305876

Change-Id: I7263ada9e311fef22810fe54a09e728bc3a6ade2
 2021-07-16 16:51:11 +00:00
Nate Myren
0abd07b3fb Merge "Null safe package name in AppOps writeState" into sc-dev 2021-07-16 16:41:28 +00:00
Suren Baghdasaryan
326599cf76 Merge "ActivityManagerService: add new lmkd kill reason" am: aebf935349 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768611

Change-Id: Ib21eab16a57fd7b43435c7b005fe64d6903f5473
 2021-07-16 16:39:34 +00:00
Nate Myren
0669fb0bfa Merge "Correctly set trusted AttributionSource in RecognitionService" into sc-dev 2021-07-16 16:37:57 +00:00
Suren Baghdasaryan
aebf935349 Merge "ActivityManagerService: add new lmkd kill reason" 2021-07-16 16:23:23 +00:00
TreeHugger Robot
43d5757809 Merge "Use '!' instead of 'x' in signal drawable" into sc-dev am: e850823da0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946255

Change-Id: I19de25c9534fff82dea9999c3db4800f65186f2a
 2021-07-16 15:32:57 +00:00
TreeHugger Robot
e850823da0 Merge "Use '!' instead of 'x' in signal drawable" into sc-dev 2021-07-16 15:30:34 +00:00
Bill Yi
8b26768b43 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a8efcd553 -s ours am: 8cacd78125 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie61b64c04f720b4bcd89a3c67bd427b6e291ab64
 2021-07-16 15:29:35 +00:00
Bill Yi
8cacd78125 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a8efcd553 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id11eea0595acc371622ec03ee595b7f214760e78
 2021-07-16 15:25:36 +00:00
Bill Yi
e73646a556 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01d6753e99 -s ours am: 4edf7c6ad0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd88b421db31dbc203bb7ee1c6a926ada09d5273
 2021-07-16 15:23:45 +00:00
Bill Yi
4edf7c6ad0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01d6753e99 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6689bafc7ca24341da9af163fa1fe6f169e83fd4
 2021-07-16 15:05:25 +00:00
Treehugger Robot
79d21ae37a Merge "HDMICEC: Add equals test for CodecSad" am: 2c677b190d am: f2ba048e8a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489238

Change-Id: I983e14ff0a8b67b41ffda5d56db04e924a1ec67c
 2021-07-16 14:35:55 +00:00
Treehugger Robot
f2ba048e8a Merge "HDMICEC: Add equals test for CodecSad" am: 2c677b190d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489238

Change-Id: I34ab813644a4f40e36218b0574091bd6d19dd893
 2021-07-16 14:19:06 +00:00
Treehugger Robot
2c677b190d Merge "HDMICEC: Add equals test for CodecSad" 2021-07-16 14:03:32 +00:00
Kalesh Singh
e24ed745d8 [automerger skipped] Merge "Add API to get GPU private memory" am: e84ebfc0fc am: b5e1145b17 -s ours 
am skip reason: Merged-In Ib90505ec184339d5acbcd42c67dad3ad65dbd933 with SHA-1 c6deb0fd9d is already in history

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

Change-Id: I3573eca5d7a958344bfadf210832e36d1de687c6
 2021-07-16 13:27:33 +00:00
Kalesh Singh
b5e1145b17 Merge "Add API to get GPU private memory" am: e84ebfc0fc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1764047

Change-Id: Id2f283abf8cb2c06b1aaec7ee7723e063f03ee5f
 2021-07-16 13:09:37 +00:00
Kalesh Singh
e84ebfc0fc Merge "Add API to get GPU private memory" 2021-07-16 12:57:49 +00:00
Treehugger Robot
d6217b06d8 Merge "Add a lock for call add/remove operations to avoid ConcurrentModificationException." am: 584003dd0d am: cb477fc498 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768612

Change-Id: Icf9b0cbb36422f725a8808f771dca7a45df68e0d
 2021-07-16 12:39:23 +00:00
Venkatarama NG. Avadhani
981814f10c HDMICEC: Add equals test for CodecSad 
Add equals test for nested class class CodecSad in HdmiUtils.

Bug: 168713324
Test: atest HdmiUtilsTest#testEqualsCodecSad
Change-Id: I5991629458ef06d9feaabec55f85c0f88368b301
Merged-In: I5991629458ef06d9feaabec55f85c0f88368b301
 2021-07-16 12:39:18 +00:00
Treehugger Robot
cb477fc498 Merge "Add a lock for call add/remove operations to avoid ConcurrentModificationException." am: 584003dd0d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768612

Change-Id: I189d728ae8f385f82bb66d244dac37f02f2edf42
 2021-07-16 12:20:49 +00:00
Treehugger Robot
584003dd0d Merge "Add a lock for call add/remove operations to avoid ConcurrentModificationException." 2021-07-16 12:05:52 +00:00
Kriti Dang
b4630c8743 Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev am: 0077afd88a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14840460

Change-Id: Ie9d1c4e039ce547eca7f3e427fa80a6fc08a963d
 2021-07-16 08:16:33 +00:00
Kriti Dang
0077afd88a Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev 2021-07-16 08:03:05 +00:00
Bill Yi
01d6753e99 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I83eeff1db894c0073f3f2df197e0d81d1a41c6cf
 2021-07-16 07:56:49 +00:00
Bill Yi
8a8efcd553 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic34f83d52511efa1e54a5c2c9cfa8664033dab88
 2021-07-16 07:48:54 +00:00
Chris Li
fa3e41dd25 Merge "Clean up previous DA organizer when registering" into sc-dev am: e032c8face 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15106415

Change-Id: Ifcafa406b33b534bcea0319437fa8d4be2e1f233
 2021-07-16 07:16:05 +00:00
Chris Li
e032c8face Merge "Clean up previous DA organizer when registering" into sc-dev 2021-07-16 06:53:18 +00:00
Tony Huang
3e2af07fda Merge "Prevent having empty task added back into TDA" into sc-dev am: f4690485e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15298116

Change-Id: I8ff2422f834c0f62547079075fc06a64e0e6c411
 2021-07-16 06:00:29 +00:00
TreeHugger Robot
29cd6f010f Merge "Make ImePerfTest wait for animation end" into sc-dev am: 28a77d5846 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15161272

Change-Id: I525cc71e8f612fdf37722a7a085c47adb245a8a3
 2021-07-16 05:59:50 +00:00
Tony Huang
f4690485e1 Merge "Prevent having empty task added back into TDA" into sc-dev 2021-07-16 05:56:08 +00:00
TreeHugger Robot
28a77d5846 Merge "Make ImePerfTest wait for animation end" into sc-dev 2021-07-16 05:40:45 +00:00
Ming-Shin Lu
d0c274537d Merge "Using WindowInsets API to hide keyboard on LockScreen when screen-off" into sc-dev am: efda0f9277 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287621

Change-Id: Iaf0deb0735c34d6480e09d1a62e8ac9020950274
 2021-07-16 05:05:00 +00:00
Ming-Shin Lu
efda0f9277 Merge "Using WindowInsets API to hide keyboard on LockScreen when screen-off" into sc-dev 2021-07-16 04:51:23 +00:00
Benedict Wong
ee52376594 Merge "Limit VCNs to one running at a given time" am: 9e6e3ce643 am: 4d16027790 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767050

Change-Id: I89be4b61ec4e3a7ed24b817acf52a9c58fb5b4f2
 2021-07-16 03:27:31 +00:00
Benedict Wong
4d16027790 Merge "Limit VCNs to one running at a given time" am: 9e6e3ce643 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767050

Change-Id: I4add4dc57ac3c49ebd66da460dd42f54f880d079
 2021-07-16 03:05:30 +00:00
Benedict Wong
9e6e3ce643 Merge "Limit VCNs to one running at a given time" 2021-07-16 02:48:06 +00:00
Dmitri Plotnikov
c37c2ba216 Merge "Fix BatteryStatsImplTest." into sc-dev am: 4162c032bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15291010

Change-Id: Ib21cd08963534c6622d095c0b3d6b7ebc4a97bcc
 2021-07-16 00:48:02 +00:00
Dmitri Plotnikov
4162c032bf Merge "Fix BatteryStatsImplTest." into sc-dev 2021-07-16 00:26:16 +00:00
TreeHugger Robot
f315248441 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6b1ec169e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81107da4ab4a2c6b5d3888225782cc09778dd696
 2021-07-15 23:54:05 +00:00
TreeHugger Robot
6b1ec169e1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-15 23:44:12 +00:00
Nate Myren
10c04b9a91 Correctly set trusted AttributionSource in RecognitionService 
Fixes: 193831522
Test: manual
Change-Id: Ib520f755c6a072bb297a4a5964b869006eefc46e
 2021-07-15 16:40:00 -07:00
John Reck
c1d7f44952 Merge "Adjust declared usage for createHardwareBitmapFromRenderNode" into sc-dev am: 53c02ec9fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301830

Change-Id: I93cd095c311b572a475a36df6feda21c31757d68
 2021-07-15 23:34:46 +00:00
John Reck
53c02ec9fd Merge "Adjust declared usage for createHardwareBitmapFromRenderNode" into sc-dev 2021-07-15 23:32:01 +00:00
Beverly Tai
92c260413e Merge "Revert "Animate in a background for kg unlock icon"" into sc-dev am: dea99bf55e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302787

Change-Id: Iec625f9ddd78fac0eee978a7829567e151af9d28
 2021-07-15 23:31:28 +00:00
Suren Baghdasaryan
1b55247fbd ActivityManagerService: add new lmkd kill reason 
Add new LOW_FILECACHE_AFTER_THRASHING kill reason introduced in lmkd.

Bug: 193293513
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I5f86197865eb0353ef2c836ec9b2aeaae3bbf2ee
 2021-07-15 23:15:15 +00:00
Beverly Tai
dea99bf55e Merge "Revert "Animate in a background for kg unlock icon"" into sc-dev 2021-07-15 23:07:38 +00:00
Beth Thibodeau
b8abde227f Merge "Always show lockdown button" into sc-dev am: 04697f8263 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15289457

Change-Id: If7727c66c823f44bcf28a20f07915069bfc92060
 2021-07-15 22:54:20 +00:00
Beth Thibodeau
04697f8263 Merge "Always show lockdown button" into sc-dev 2021-07-15 22:44:24 +00:00