Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
762,909 Commits 3 Branches 0 Tags
857684b56e2581707f3233094de9db512355833c
Commit Graph

762909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
857684b56e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8eacc71a03 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e2c9f1e84173e4566db785baf5e8a87b3354da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:08:11 +00:00
Bill Yi
0071f403d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 55f2848df8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7ea1a11529c87fe31b93bdd9d6e89c18d557914e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:08:05 +00:00
Bill Yi
7c248c16a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b1fcc3c8fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f17ebf3d44e248a51c7d6a2d249d66489c30db9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:07:55 +00:00
Bill Yi
6ee00dd033 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0ac994c6b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ee85433c7f5fbe11f6ec20f3e6ad9ab00a833d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:07:43 +00:00
Bill Yi
693277b009 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e48ec156f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id30040b68854feebe113e7fad4134f3b33a339e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:07:22 +00:00
Bill Yi
55f2848df8 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-25 18:43:37 +00:00
Bill Yi
0ac994c6b0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-25 18:43:37 +00:00
Treehugger Robot
aaf1a497fa Merge "Add dipankarb to storage owners" am: 6b7ebbfd26 am: 053f3b9137 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2106664

Change-Id: I6a218ebe48fda341f13ee7036e8c41a3f27df209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 18:42:29 +00:00
Treehugger Robot
5bc866e451 [automerger skipped] Merge "Treat allowlists differently for flattened apex" am: 94651571bc am: dd04a0cb26 -s ours 
am skip reason: Merged-In I1971a686aa111b396f9e694a74be70d758078423 with SHA-1 fd1c87c0a6 is already in history

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

Change-Id: Ia745c4177a4609630e9efd0c6844f7eff8963e3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 18:42:00 +00:00
Treehugger Robot
053f3b9137 Merge "Add dipankarb to storage owners" am: 6b7ebbfd26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2106664

Change-Id: I7f056b43ca1124f7ee7a824015c314e8f1f95533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 18:24:15 +00:00
Treehugger Robot
dd04a0cb26 Merge "Treat allowlists differently for flattened apex" am: 94651571bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2105512

Change-Id: I26f0cf634a93d1f6fe14dbf3e1d96b27b0c70014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 18:23:46 +00:00
Treehugger Robot
6b7ebbfd26 Merge "Add dipankarb to storage owners" 2022-05-25 18:21:47 +00:00
TreeHugger Robot
5ca656b301 Merge "Catch when telecom isn't ready yet" into tm-dev am: 5a633e1b99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18577095

Change-Id: I3b5660be715a2366915ecf6d415319b91c8e28fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 18:15:33 +00:00
Songchun Fan
53e005449f Merge "[pm] update shared libraries if the old package used it" into tm-dev am: f77a4fd308 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18589115

Change-Id: Id7f44d955bb0e94f94c36c680cae9eeea2232abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 18:14:55 +00:00
Andrii Kulian
73cceb58cd Merge "Synchronize SplitController" into tm-dev am: d4d0fee814 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18418602

Change-Id: Ie8fe385b3d2bfe862ed2ba8ecd228860cbab10f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 18:14:30 +00:00
TreeHugger Robot
5a633e1b99 Merge "Catch when telecom isn't ready yet" into tm-dev 2022-05-25 18:13:06 +00:00
Treehugger Robot
94651571bc Merge "Treat allowlists differently for flattened apex" 2022-05-25 17:59:05 +00:00
Songchun Fan
f77a4fd308 Merge "[pm] update shared libraries if the old package used it" into tm-dev 2022-05-25 17:52:36 +00:00
Andrii Kulian
d4d0fee814 Merge "Synchronize SplitController" into tm-dev 2022-05-25 17:48:24 +00:00
Mateusz Cicheński
05edfc28a1 Merge "Check for null mLeash before setting alpha." into tm-dev am: 1f9afd727a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18585595

Change-Id: Ie845699d41684ef08a0c3cc3677d2a2b5217419c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 17:01:20 +00:00
Treehugger Robot
b1ca9c59ed Merge "Update ASM usage to ASM9" am: 24fbdff6a0 am: 086cf4b5fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2104644

Change-Id: I292b1e5e4a8d151a58d08c99dd64624e28d9a944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 16:54:43 +00:00
Mateusz Cicheński
1f9afd727a Merge "Check for null mLeash before setting alpha." into tm-dev 2022-05-25 16:35:38 +00:00
Treehugger Robot
086cf4b5fb Merge "Update ASM usage to ASM9" am: 24fbdff6a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2104644

Change-Id: Ie51315d31f67b7385ccffd3ef90c4b152b0b5740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 16:25:55 +00:00
Dipankar Bhardwaj
2b932750af Add dipankarb to storage owners 
Change-Id: I486ad459e945340865adcc030286c443afa7007b
Test: n/a
Bug: 233893599
 2022-05-25 16:20:53 +00:00
Jack Yu
89398af062 Merge "Traffic descriptor only data profile should be enabled" into tm-dev am: e55b0a1f17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18567917

Change-Id: I30f34f43502ffe10677e1432c4a05dd51a37de7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 16:07:44 +00:00
Treehugger Robot
24fbdff6a0 Merge "Update ASM usage to ASM9" 2022-05-25 16:03:15 +00:00
Jack Yu
e55b0a1f17 Merge "Traffic descriptor only data profile should be enabled" into tm-dev 2022-05-25 15:46:25 +00:00
TreeHugger Robot
df2b24a558 Merge "Merge "Map WRITE_SECURITY_LOG permission to gid" am: 2b2b455884 am: 356f81b957" into tm-dev-plus-aosp 2022-05-25 15:32:15 +00:00
Jeff DeCew
9add045b55 Revert suppression of recalculation to fix jump after aod->ls animation am: c003cb8785 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581099

Change-Id: I3790cf5b7ceb9c59e7d31b4bbbe4ba86b2db5960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 14:56:56 +00:00
Andrei Onea
ede686e3a3 Treat allowlists differently for flattened apex 
On devices which use flattened APEX, treat the allowlists as part of the
system image.

Test: m # lunch wembley_2GB-userdebug
Bug: 221862988
Change-Id: I1971a686aa111b396f9e694a74be70d758078423
Merged-In: I1971a686aa111b396f9e694a74be70d758078423
 2022-05-25 13:23:08 +00:00
Rubin Xu
c8c601c335 Merge "Map WRITE_SECURITY_LOG permission to gid" am: 2b2b455884 am: 356f81b957 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2105065

Change-Id: Ic70701d437bc15b73b8ff85004c0329059499d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 12:20:46 +00:00
Rubin Xu
356f81b957 Merge "Map WRITE_SECURITY_LOG permission to gid" am: 2b2b455884 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2105065

Change-Id: I8453536d82e840da22d7f94a167f4a95b3826ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 12:01:56 +00:00
Rubin Xu
2b2b455884 Merge "Map WRITE_SECURITY_LOG permission to gid" 2022-05-25 11:43:50 +00:00
Jeff DeCew
c003cb8785 Revert suppression of recalculation to fix jump after aod->ls animation 
The change I6575f733b17d6c8905150c0a7854d752dd0a5cfe suppressed recalculation of the number of notifications whenever dozeAmount != 0.  However, this meant that from the time the device was locked to the time it finished the screen on animation, the number of notifications that fit on the device was never updated.  In cases where notifications changed while on aod, this meant the number could be completely wrong.  But even without that, this meant that when locking the device and then unlocking, the count would be based on the height of the notifications given their non-keyguard expansion state (i.e. first notification expanded) which meant that we almost always showed too few notifications during the aod->ls transition.

I am unable to reproduce b/229882633 (which that CL was fixing) until I also revert I139d25e2bb57257a18f18f6288f3e18b7a1b72d1 which landed a week later.

Bug: 229882633
Fixes: 232079794
Test: atest NotificationPanelViewControllerTest
Test: numerous failed attempts to reproduce b/229882633#comment2
Test: unlock; screen off (to aod); screen on (to ls); observe no jumps
Test: post notify notifications with "no text" ; slow animations; lock; aod -> ls; post notifications via shell during animation; observe no jumps during or at end of animation
Change-Id: Ib3a3c6377a71cc4c1a1b06eb652237a5493a56d0
 2022-05-25 10:59:29 +00:00
Lucas Lin
76ca007028 [automerger skipped] Merge changes from topics "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED", "CATEGORY_EVENT_DEACTIVATED_BY_USER" into tm-dev am: 0b2c39c7b2 -s ours 
am skip reason: Merged-In I35fc360204f0227a969ff2b12a4c47f701a55a9c with SHA-1 3f5bf1f059 is already in history

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

Change-Id: Ib169631707278e737040a2480aa4280ecfe91371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 10:35:04 +00:00
lucaslin
8dcd80f7e3 [automerger skipped] Send VPN manager event when VPN is deactivated am: b708333765 -s ours 
am skip reason: Merged-In I35fc360204f0227a969ff2b12a4c47f701a55a9c with SHA-1 3f5bf1f059 is already in history

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

Change-Id: I4c1d3a32ae1f77bf80ce62dd8cd53954d8c9a456
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 10:34:50 +00:00
Lucas Lin
0b2c39c7b2 Merge changes from topics "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED", "CATEGORY_EVENT_DEACTIVATED_BY_USER" into tm-dev 
* changes:
  Send VPN manager event when VPN is deactivated
  Send VPN manager event when VPN always-on status is changed
 2022-05-25 10:20:18 +00:00
TreeHugger Robot
d94d4f0bd2 Merge "Do not get portInfo if physical address is 0x0000" into tm-dev am: 054f5c15c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18570258

Change-Id: If3663a7d9ef50613acaf6b528ddcf7474d7de9cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 10:07:39 +00:00
TreeHugger Robot
054f5c15c9 Merge "Do not get portInfo if physical address is 0x0000" into tm-dev 2022-05-25 09:50:05 +00:00
Sudheer Shanka
f9d1137bbb Merge "Allow shell uid without checking the package name." into tm-dev am: 5caf3932af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18584744

Change-Id: Ia6dfd5a36d36d803ef6f08ca2fd2f904dfd12851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 08:28:55 +00:00
Sudheer Shanka
5caf3932af Merge "Allow shell uid without checking the package name." into tm-dev 2022-05-25 08:13:54 +00:00
Tony Huang
225f54892a Merge "Fix NPE if draging again while animating" into tm-dev am: a876e7b2d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18570244

Change-Id: Id96f7a42ee860487749c10ee36b5a157217fcdb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 07:09:45 +00:00
Calvin Pan
ca00515971 Merge "Fix using incorrect view in app language selection" into tm-dev am: fa264b81be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18579445

Change-Id: I3f794e4add28c46c7e2f77ea39eb12db82f683a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 07:08:48 +00:00
Tony Huang
a876e7b2d0 Merge "Fix NPE if draging again while animating" into tm-dev 2022-05-25 06:53:54 +00:00
Calvin Pan
fa264b81be Merge "Fix using incorrect view in app language selection" into tm-dev 2022-05-25 06:51:35 +00:00
TreeHugger Robot
401192a1c0 Merge "Use max height attr as backup for device config" into tm-dev am: 248de47fe1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18529605

Change-Id: I78137d58d0d3df36c42ffc4e7839475c24ae3958
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 03:52:24 +00:00
Andrii Kulian
40a67faae4 Synchronize SplitController 
Adding synchronization to the public methods in SplitController,
as they might be called on different threads and cause a
ConcurrentModificationException.

Bug: 228201646
Test: atest CtsWindowManagerJetpackTestCases --iterations 100
Change-Id: I2db9ccb5e9829487eae7aa85eff5f6153721cc04
 2022-05-25 03:32:54 +00:00
TreeHugger Robot
248de47fe1 Merge "Use max height attr as backup for device config" into tm-dev 2022-05-25 03:26:37 +00:00
Calvin Pan
5f8fa45e80 Fix using incorrect view in app language selection 
Bug: 233175025
Test: By manual
Change-Id: Idd5b277cdfb737acf9262ff5efbeca93afaa100f
 2022-05-25 03:15:19 +00:00
Lyn Han
ef171ff795 Merge "Revert "Make media squishy for portrait shade open and close"" into tm-dev am: 5bcfb4c3fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18566290

Change-Id: I10c6b9359aad18cb438e7062f9feb59ce3233c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 03:00:52 +00:00