Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
723,739 Commits 3 Branches 0 Tags
3ba67657c7093619e6277ee2568cffc331bd5d91
Commit Graph

723739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
3ba67657c7 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c9d35cf4d0 2p: 19cc11f443 
Blank merge reason: parent was merged -s ours

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

Change-Id: Ic911a0a58d7ffe64eb82e7afe2ca1075d27f12f6
 2021-10-01 19:03:39 +00:00
Bill Yi
19cc11f443 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c9d35cf4d0 
Blank merge reason: commit message contains skip directive

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

Change-Id: I1ef33f9a574c85f3d9165bd776ab4627c7c64eda
 2021-10-01 19:03:25 +00:00
Bill Yi
c9d35cf4d0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib246fb025736e4699ed1d610f7d6b0ec7eb13f20
 2021-10-01 19:03:08 +00:00
Chavi Weingarten
e55fbe4ea9 Merge "Update setBuffer to use the new setBuffer API" 2021-10-01 17:43:00 +00:00
Patrick Baumann
8a5d660c41 Merge "Fix the overrides file corruption due to shutdown" 2021-10-01 16:38:39 +00:00
Li Li
5c846c1d8f Merge "Freezer: don't skip processes with file locks" 2021-10-01 15:31:29 +00:00
TreeHugger Robot
9de0c59064 Merge "Smartspace - Don't connect until setup" 2021-10-01 14:50:11 +00:00
TreeHugger Robot
78a5d3d007 Merge "Letterbox Reachability: Add a central stop for repositioning." into sc-v2-dev am: 475584bd10 am: 9cf5a2d6ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934230

Change-Id: I8c87742699cd8179510ffdd0d2c8482c12f9d9e6
 2021-10-01 13:59:00 +00:00
TreeHugger Robot
9cf5a2d6ae Merge "Letterbox Reachability: Add a central stop for repositioning." into sc-v2-dev am: 475584bd10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934230

Change-Id: I97fb5e6d723f00bf042e40fafa48ffea2393c6f1
 2021-10-01 13:54:36 +00:00
Mohammad Islam
7c7383d982 [automerger skipped] Merge "libbinder: split out PackageManagerNative aidl" am: cbe9af5ab5 -s ours am: c0da9473bc -s ours am: c240dd3e01 -s ours am: dca6914696 -s ours am: f35b7fe044 -s ours 
am skip reason: Merged-In Ie64fb3502d8e5164df4710feb2f525db7c4234a2 with SHA-1 bdbf40efd6 is already in history

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

Change-Id: Ifb35040a0e591ab4fafbb43b72889b5f5acdeb46
 2021-10-01 13:53:53 +00:00
Mohammad Islam
f35b7fe044 [automerger skipped] Merge "libbinder: split out PackageManagerNative aidl" am: cbe9af5ab5 -s ours am: c0da9473bc -s ours am: c240dd3e01 -s ours am: dca6914696 -s ours 
am skip reason: Merged-In Ie64fb3502d8e5164df4710feb2f525db7c4234a2 with SHA-1 bdbf40efd6 is already in history

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

Change-Id: I67b658dabeb627b8f01cfe20d79584a451708d6b
 2021-10-01 13:40:44 +00:00
TreeHugger Robot
475584bd10 Merge "Letterbox Reachability: Add a central stop for repositioning." into sc-v2-dev 2021-10-01 13:40:26 +00:00
Mohammad Islam
dca6914696 [automerger skipped] Merge "libbinder: split out PackageManagerNative aidl" am: cbe9af5ab5 -s ours am: c0da9473bc -s ours am: c240dd3e01 -s ours 
am skip reason: Merged-In Ie64fb3502d8e5164df4710feb2f525db7c4234a2 with SHA-1 bdbf40efd6 is already in history

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

Change-Id: I8226dc4f2e6ed66a831d8cdd8a59d18fa2d79de9
 2021-10-01 13:27:55 +00:00
Mohammad Islam
c240dd3e01 [automerger skipped] Merge "libbinder: split out PackageManagerNative aidl" am: cbe9af5ab5 -s ours am: c0da9473bc -s ours 
am skip reason: Merged-In Ie64fb3502d8e5164df4710feb2f525db7c4234a2 with SHA-1 bdbf40efd6 is already in history

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

Change-Id: Ib0fa01c58a66714496584650fcd4606b2d00181e
 2021-10-01 13:15:13 +00:00
Mohammad Islam
c0da9473bc [automerger skipped] Merge "libbinder: split out PackageManagerNative aidl" am: cbe9af5ab5 -s ours 
am skip reason: Merged-In Ie64fb3502d8e5164df4710feb2f525db7c4234a2 with SHA-1 bdbf40efd6 is already in history

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

Change-Id: Ie7f943a3e6ea6605d900eeb816a10255d937e6fe
 2021-10-01 13:01:56 +00:00
Mohammad Islam
cbe9af5ab5 Merge "libbinder: split out PackageManagerNative aidl" 2021-10-01 12:52:23 +00:00
Alex Chau
396c9c5f5d Merge "Listen for ComponentCallback.onConfigurationChanged in TaskbarDelegate" into sc-v2-dev am: 97a5f472cc am: a3d3d595f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15948723

Change-Id: I785cd34f0b86f47df092fbdffefadb7f174ceede
 2021-10-01 12:20:30 +00:00
Chris Li
8271bc2aa8 Merge "Change the activity reparent to animate at TaskFragment level." into sc-v2-dev am: 21f6fdd842 am: a310195b5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15938346

Change-Id: I41d25dc88f931b76344d545fec221d2acf6764e6
 2021-10-01 12:20:10 +00:00
TreeHugger Robot
63a18c7e4a Merge "Fixing studio build due to androidprv" into sc-v2-dev am: 13e3341864 am: 32e27a9b45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15951399

Change-Id: I0fe99c5e2bee26a54fcccc7993c0dfc3284a9c5f
 2021-10-01 12:19:39 +00:00
Alex Chau
a3d3d595f1 Merge "Listen for ComponentCallback.onConfigurationChanged in TaskbarDelegate" into sc-v2-dev am: 97a5f472cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15948723

Change-Id: Ibbcf029a22977401a03a1dea7469471566a14344
 2021-10-01 12:05:59 +00:00
Chris Li
a310195b5e Merge "Change the activity reparent to animate at TaskFragment level." into sc-v2-dev am: 21f6fdd842 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15938346

Change-Id: I7289e0d841942d52bca2d4fd6d621958a71741f8
 2021-10-01 12:05:31 +00:00
TreeHugger Robot
32e27a9b45 Merge "Fixing studio build due to androidprv" into sc-v2-dev am: 13e3341864 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15951399

Change-Id: I544523b80fdb64e19f0dd9af93b3ecd68c422cc5
 2021-10-01 12:04:57 +00:00
Alex Chau
97a5f472cc Merge "Listen for ComponentCallback.onConfigurationChanged in TaskbarDelegate" into sc-v2-dev 2021-10-01 12:01:35 +00:00
Anton Hansson
b6165c5893 Merge "Revert "Add build rule to merge annotation zips"" into stage-aosp-master am: 474565918b am: 59e08f242e am: 385b55ede0 am: 866b068b9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15951450

Change-Id: I432f3c8d646f04d33614a66183eadf07aba99639
 2021-10-01 11:59:47 +00:00
Chris Li
21f6fdd842 Merge "Change the activity reparent to animate at TaskFragment level." into sc-v2-dev 2021-10-01 11:58:54 +00:00
TreeHugger Robot
13e3341864 Merge "Fixing studio build due to androidprv" into sc-v2-dev 2021-10-01 11:50:28 +00:00
Anton Hansson
866b068b9d Merge "Revert "Add build rule to merge annotation zips"" into stage-aosp-master am: 474565918b am: 59e08f242e am: 385b55ede0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15951450

Change-Id: I0f11502d9a9957deb0e9dac70ff8df0806323678
 2021-10-01 11:47:31 +00:00
Kriti Dang
ea1857ae37 Merge "Changing the order of width and height in constructing Display.Mode" 2021-10-01 11:44:28 +00:00
Anton Hansson
385b55ede0 Merge "Revert "Add build rule to merge annotation zips"" into stage-aosp-master am: 474565918b am: 59e08f242e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15951450

Change-Id: I61e10eb398ca2814b2a297ebbe36aaac07d697a7
 2021-10-01 11:38:35 +00:00
Anton Hansson
59e08f242e Merge "Revert "Add build rule to merge annotation zips"" into stage-aosp-master am: 474565918b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15951450

Change-Id: I84da42c48c855410193f2e319507bc2e48031a66
 2021-10-01 11:24:17 +00:00
Anton Hansson
474565918b Merge "Revert "Add build rule to merge annotation zips"" into stage-aosp-master 2021-10-01 11:14:46 +00:00
Mohammad Samiul Islam
205229f5e9 Revert "Add build rule to merge annotation zips" 
This reverts commit bab3cc34de.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_sc-dev-plus-aosp&target=build_test2&lkgb=7785129&lkbb=7785207&fkbb=7785207, bug b/201757759.

Bug: 201757759
Change-Id: I653b3cf1bbc2c3c11ceb34e578bd9b860057c527
 2021-10-01 11:13:50 +00:00
Bernardo Rufino
a6e167cd1e Merge "Correct Parcel value types" am: 861d2e12cb am: e9ffc7f08f am: 633ca9c492 am: ac52200025 am: b87435bdec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1838973

Change-Id: I4968627d5b65b20872c1c6c0418da88460da93b3
 2021-10-01 10:51:00 +00:00
Bernardo Rufino
b87435bdec Merge "Correct Parcel value types" am: 861d2e12cb am: e9ffc7f08f am: 633ca9c492 am: ac52200025 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1838973

Change-Id: If7de308e91a5b5a8f1c110ec2ba62d7b695a4c1d
 2021-10-01 10:35:20 +00:00
TreeHugger Robot
d77a1f2422 [automerger skipped] Merge "Add missing check in hasGrantedPolicy" into sc-qpr1-dev am: 0beddf145a am: 3900641f4f -s ours am: ff7e86abd3 -s ours 
am skip reason: Merged-In I6f821d039a6dfd70fb005165af2c5cb13ad3de9b with SHA-1 251176e774 is already in history

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

Change-Id: I9102e99541d34964883b6562319822ac927c9286
 2021-10-01 10:24:36 +00:00
TreeHugger Robot
84d10664eb [automerger skipped] Merge "Add missing check in hasGrantedPolicy" into sc-qpr1-dev am: 0beddf145a am: 64b856c601 am: 6e4f53e93a -s ours 
am skip reason: Merged-In I6f821d039a6dfd70fb005165af2c5cb13ad3de9b with SHA-1 c7abd726dd is already in history

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

Change-Id: I538423b8cf69e66a0987e13c2eaf69a039112912
 2021-10-01 10:24:04 +00:00
Bernardo Rufino
ac52200025 Merge "Correct Parcel value types" am: 861d2e12cb am: e9ffc7f08f am: 633ca9c492 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1838973

Change-Id: I7f2369e7406517ee39d2738f25e44f6c29a4c637
 2021-10-01 10:23:59 +00:00
TreeHugger Robot
ff7e86abd3 [automerger skipped] Merge "Add missing check in hasGrantedPolicy" into sc-qpr1-dev am: 0beddf145a am: 3900641f4f -s ours 
am skip reason: Merged-In I6f821d039a6dfd70fb005165af2c5cb13ad3de9b with SHA-1 251176e774 is already in history

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

Change-Id: Ifc4ff6e5ac9db12ae6319186f54b472e93238c0f
 2021-10-01 10:23:54 +00:00
Anton Hansson
88ca58f420 Merge "Add build rule to merge annotation zips" into stage-aosp-master am: f218033ccf am: 30c5351527 am: 8e00cdd0fe am: fb1757f212 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15920466

Change-Id: Ifccb022f891dbb5b989a7330cea2baee934b0831
 2021-10-01 10:23:31 +00:00
Bernardo Rufino
633ca9c492 Merge "Correct Parcel value types" am: 861d2e12cb am: e9ffc7f08f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1838973

Change-Id: If5ecf9db638a32fcdeb1ed59d338c7c0e1313c85
 2021-10-01 10:09:50 +00:00
TreeHugger Robot
6e4f53e93a Merge "Add missing check in hasGrantedPolicy" into sc-qpr1-dev am: 0beddf145a am: 64b856c601 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15838542

Change-Id: Ida3864ef74a50d637c559155c2edc47391267857
 2021-10-01 10:09:34 +00:00
Anton Hansson
fb1757f212 Merge "Add build rule to merge annotation zips" into stage-aosp-master am: f218033ccf am: 30c5351527 am: 8e00cdd0fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15920466

Change-Id: Ie696f2ce7064a70ac488630821fc2c977b185ca3
 2021-10-01 10:09:15 +00:00
TreeHugger Robot
3900641f4f Merge "Add missing check in hasGrantedPolicy" into sc-qpr1-dev am: 0beddf145a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15838542

Change-Id: I5acfe3c0df1b6b7aaa75cfdf3c3b3df110041444
 2021-10-01 10:06:20 +00:00
TreeHugger Robot
64b856c601 Merge "Add missing check in hasGrantedPolicy" into sc-qpr1-dev am: 0beddf145a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15838542

Change-Id: I2db172a0718dc77f1f73d94d60edcfe982416d97
 2021-10-01 10:06:20 +00:00
TreeHugger Robot
6e7100cdd3 [automerger skipped] Merge "[DO NOT MERGE] Make sure smartspace connects when added" into sc-v2-dev am: c4c480ab7e am: 4ea7195aa6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6870301a3dc51adef6083e2db3d0586b13fbaadc
 2021-10-01 10:06:05 +00:00
Matt Pietal
1d765b3f7b [automerger skipped] [DO NOT MERGE] Make sure smartspace connects when added am: 5739b63774 am: 440fad9a12 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0efa4fe5b3e13fb8e59d175bfe2b22cb08975f6c
 2021-10-01 10:05:56 +00:00
TreeHugger Robot
47dd8e690f [automerger skipped] Merge "Removing unused big_clock_container" into sc-v2-dev am: dbb3ce62b0 am: 398946c4ba -s ours 
am skip reason: Merged-In I0232c419cfac76efb135e69db7eb7f98b905fefa with SHA-1 b288916a4c is already in history

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

Change-Id: Ic8c5c7ee20595608887a10f2cc4b9ad719a8e837
 2021-10-01 10:05:33 +00:00
Bernardo Rufino
e9ffc7f08f Merge "Correct Parcel value types" am: 861d2e12cb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1838973

Change-Id: I0ad34ad29a54cf58ac37ec347a59b45a59959ea1
 2021-10-01 09:58:17 +00:00
Anton Hansson
8e00cdd0fe Merge "Add build rule to merge annotation zips" into stage-aosp-master am: f218033ccf am: 30c5351527 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15920466

Change-Id: Ief3567d6c02b13fa48b8a2560b92cfe88ef6ba37
 2021-10-01 09:57:30 +00:00
TreeHugger Robot
0beddf145a Merge "Add missing check in hasGrantedPolicy" into sc-qpr1-dev 2021-10-01 09:54:29 +00:00