Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
660,034 Commits 3 Branches 0 Tags
e99dc522fe2f1a2fb01ea4aa03db265fef2ccee3
Commit Graph

660034 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mady Mellor
e99dc522fe Merge "Only load the overflow data once" into sc-v2-dev am: 6de523e30b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15289567

Change-Id: I2ebd8a49581b6e8e8535a04b480595ca8cb7abdb
 2021-07-16 18:15:24 +00:00
Mady Mellor
6de523e30b Merge "Only load the overflow data once" into sc-v2-dev 2021-07-16 17:59:01 +00:00
TreeHugger Robot
eb171127ee Merge "Fix NPE when calling PasswordViewEntry.getWindowInsetsController().hide()" into sc-dev am: 5235bc493d am: 737b8ac197 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15309902

Change-Id: I3954d27fb4732523ea9b98a64bc59cabf02bcb52
 2021-07-16 17:55:30 +00:00
TreeHugger Robot
72f5a4bc29 Merge "Fix NPE when calling PasswordViewEntry.getWindowInsetsController().hide()" into sc-dev am: 5235bc493d am: 9d64adaf56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15309902

Change-Id: I01c01409ba71e64d785b250b7724878063e7cd25
 2021-07-16 17:55:12 +00:00
TreeHugger Robot
9d64adaf56 Merge "Fix NPE when calling PasswordViewEntry.getWindowInsetsController().hide()" into sc-dev am: 5235bc493d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15309902

Change-Id: Ie6ec75abf608e00965afc8dc602d22fd9639c45d
 2021-07-16 17:42:36 +00:00
TreeHugger Robot
737b8ac197 Merge "Fix NPE when calling PasswordViewEntry.getWindowInsetsController().hide()" into sc-dev am: 5235bc493d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15309902

Change-Id: I1a33101dd5aac59aee2f321f1036725fc40edd80
 2021-07-16 17:41:47 +00:00
TreeHugger Robot
5235bc493d Merge "Fix NPE when calling PasswordViewEntry.getWindowInsetsController().hide()" into sc-dev 2021-07-16 17:29:46 +00:00
Yifan Hong
d1c856bbd7 Merge "AndroidRuntime: Expose GetJavaVM" am: baba1f7d96 am: ca676985ad am: 1d695e8000 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767690

Change-Id: I4929e20cce1b2159a5259fada5d1194e7fa13383
 2021-07-16 17:17:24 +00:00
Sally Yuen
4355b83f59 Merge "Don't query a null AccessibiiltyNodeInfo when populating ViewStructure" into sc-dev am: ea5ce681f3 am: 2df92f5460 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305983

Change-Id: I2f69344fccdc2c6c375bab1d2f65afae9a6663cc
 2021-07-16 17:16:55 +00:00
Automerger Merge Worker
b4edc61514 Merge "Merge "Null check color_space_ptr in draw functor" into sc-dev am: 717af18b7e am: e6eafafe42" into sc-v2-dev-plus-aosp 2021-07-16 17:16:52 +00:00
Automerger Merge Worker
034cf885c2 Merge "Merge "Don't query a null AccessibiiltyNodeInfo when populating ViewStructure" into sc-dev am: ea5ce681f3 am: 6ee44d7939" into sc-v2-dev-plus-aosp 2021-07-16 17:16:47 +00:00
TreeHugger Robot
666f05e99c Merge "Null check color_space_ptr in draw functor" into sc-dev am: 717af18b7e am: e6eafafe42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305824

Change-Id: I4ad3e3681276954082399e89a53c56265307a16a
 2021-07-16 17:16:45 +00:00
Automerger Merge Worker
b921118eda Merge "Merge "ActivityManagerService: add new lmkd kill reason" am: aebf935349 am: 326599cf76 am: d7fbb1fe98" into sc-v2-dev-plus-aosp 2021-07-16 17:16:40 +00:00
Sally Yuen
37b99ca35b Merge "Don't query a null AccessibiiltyNodeInfo when populating ViewStructure" into sc-dev am: ea5ce681f3 am: 6ee44d7939 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305983

Change-Id: I50b60b4d91be5d301b15783c47e13c67b3b96245
 2021-07-16 17:16:39 +00:00
Suren Baghdasaryan
132e4a9bf4 Merge "ActivityManagerService: add new lmkd kill reason" am: aebf935349 am: 326599cf76 am: d7fbb1fe98 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768611

Change-Id: Ibf02f355a27f6c5d57976c6ce1852c750449af99
 2021-07-16 17:16:36 +00:00
TreeHugger Robot
6d1e336abe Merge "Null check color_space_ptr in draw functor" into sc-dev am: 717af18b7e am: 57de140eb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305824

Change-Id: I8c26197750a51cbffd0ccd2150b95131da72b732
 2021-07-16 17:16:29 +00:00
Automerger Merge Worker
4a2d0a9b6f Merge "Merge "Null safe package name in AppOps writeState" into sc-dev am: 0abd07b3fb am: 0f5068fa09" into sc-v2-dev-plus-aosp 2021-07-16 17:16:21 +00:00
Nate Myren
c1f6d61d54 Merge "Null safe package name in AppOps writeState" into sc-dev am: 0abd07b3fb am: 65f5d4f3e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301695

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

Change-Id: I0c101d5f5aec2e4e464927b7037f86092a8070ed
 2021-07-16 17:16:14 +00:00
Automerger Merge Worker
ad8c28cc12 Merge "Merge "Correctly set trusted AttributionSource in RecognitionService" into sc-dev am: 0669fb0bfa am: 0d196dc422" into sc-v2-dev-plus-aosp 2021-07-16 17:16:02 +00:00
Nate Myren
a48d822245 Merge "Correctly set trusted AttributionSource in RecognitionService" into sc-dev am: 0669fb0bfa am: 0d196dc422 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305876

Change-Id: I0361ae393bee83aee29e44ecc90c27e89693f38b
 2021-07-16 17:15:58 +00:00
Yifan Hong
1d695e8000 Merge "AndroidRuntime: Expose GetJavaVM" am: baba1f7d96 am: ca676985ad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767690

Change-Id: I90a1a27d1cae31106c3729921018d3ae3e8c0490
 2021-07-16 17:15:53 +00:00
Nate Myren
3d23e5498d Merge "Correctly set trusted AttributionSource in RecognitionService" into sc-dev am: 0669fb0bfa am: 777a962541 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305876

Change-Id: I77b3a25cd276d4b71c4e5157bdd1f4f5974685d9
 2021-07-16 17:15:50 +00:00
Sally Yuen
2df92f5460 Merge "Don't query a null AccessibiiltyNodeInfo when populating ViewStructure" into sc-dev am: ea5ce681f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305983

Change-Id: I113cb66c172204f898c12e77df5a0b85df643d1e
 2021-07-16 17:15:46 +00:00
TreeHugger Robot
e6eafafe42 Merge "Null check color_space_ptr in draw functor" into sc-dev am: 717af18b7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305824

Change-Id: I9edc912feb3b6f9e5fa012257dbd547eaed4c576
 2021-07-16 17:14:56 +00:00
Yifan Hong
ca676985ad Merge "AndroidRuntime: Expose GetJavaVM" am: baba1f7d96 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767690

Change-Id: I009d9510392a7b1a540ea36503845f98d264bd17
 2021-07-16 17:03:20 +00:00
Yifan Hong
baba1f7d96 Merge "AndroidRuntime: Expose GetJavaVM" 2021-07-16 16:58:19 +00:00
Sally Yuen
6ee44d7939 Merge "Don't query a null AccessibiiltyNodeInfo when populating ViewStructure" into sc-dev am: ea5ce681f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305983

Change-Id: Icd17aeb6cdb7b06cf6bb097b225f23f884869ee4
 2021-07-16 16:56:04 +00:00
TreeHugger Robot
57de140eb0 Merge "Null check color_space_ptr in draw functor" into sc-dev am: 717af18b7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305824

Change-Id: I35d0bbb7a436f1f125195970fd6bee85a632fdbb
 2021-07-16 16:55:55 +00:00
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
Sally Yuen
ea5ce681f3 Merge "Don't query a null AccessibiiltyNodeInfo when populating ViewStructure" into sc-dev 2021-07-16 16:53:17 +00:00
TreeHugger Robot
717af18b7e Merge "Null check color_space_ptr in draw functor" into sc-dev 2021-07-16 16:52:59 +00:00
Nate Myren
0f5068fa09 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: I1ad1a9e7ef54ccdaddfd620d0679c67f0df9ecd8
 2021-07-16 16:52:34 +00:00
Nate Myren
777a962541 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: I7db6bf5e4f450a8cdb5e0f4a4f1593b966a71fc0
 2021-07-16 16:51:45 +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
940bfc814a Merge "Use '!' instead of 'x' in signal drawable" into sc-dev am: e850823da0 am: 43d5757809 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946255

Change-Id: I8a4b6087041422969c2b09d228881c1143eec0aa
 2021-07-16 15:40:21 +00:00
Bill Yi
4bc42433a5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a8efcd553 -s ours am: 8cacd78125 -s ours am: 8b26768b43 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0889e0f47d50def7e226da1b7be1259db0dbb214
 2021-07-16 15:39:59 +00:00
Automerger Merge Worker
88aca9733a Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01d6753e99 -s ours am: 4edf7c6ad0 -s ours am: e73646a556 -s ours" into sc-v2-dev-plus-aosp 2021-07-16 15:39:35 +00:00
Bill Yi
e0114c48c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01d6753e99 -s ours am: 4edf7c6ad0 -s ours am: e73646a556 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05bcda99ec51558a6c413520c21c79f1bbf0cfe2
 2021-07-16 15:39:12 +00:00
TreeHugger Robot
3d27f6d519 Merge "Use '!' instead of 'x' in signal drawable" into sc-dev am: e850823da0 am: 57e372bc2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946255

Change-Id: If6df3bd8ad71bf8a26be22280a9e38d913d0b3f0
 2021-07-16 15:38:54 +00:00
TreeHugger Robot
57e372bc2a 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: I8f0d4a69c6e4c3196290736084645bbf7d93dcb5
 2021-07-16 15:33:46 +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
Bill Yi
b20c4fe4e8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a8efcd553 -s ours am: 8cacd78125 -s ours am: 107427fcda -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I827fa7c24efb5a0cc89210ba52c1612371c76284
 2021-07-16 15:30:35 +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
8650f95a9a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01d6753e99 -s ours am: 4edf7c6ad0 -s ours am: fe2b858327 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4af70514c2c0f57993bd6227673712101b0a63e1
 2021-07-16 15:30:29 +00:00