Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
495,449 Commits 3 Branches 0 Tags
e383c8697f53a422b6d308c97d708d7f73dff45f
Commit Graph

495449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
e383c8697f [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours am: db4d949ee2 -s ours am: 31accf77d8 am: aa1073f47f -s ours am: 5529699510 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512683

Change-Id: Ie1d66b36bd6b17c2326ad84f069dc5fbcc3fcf8b
 2020-09-10 00:21:05 +00:00
TreeHugger Robot
1ed53ed94e Merge "Sanitize more of the notification text fields" into rvc-dev am: ceb7aefd6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512483

Change-Id: Ief6065688eb49cd0d795dbd892ea9bfa76290f2b
 2020-09-10 00:20:15 +00:00
Julia Reynolds
5529699510 [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours am: db4d949ee2 -s ours am: 31accf77d8 am: aa1073f47f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d8d4353eba00391f08299170673942f7befed49
 2020-09-09 23:56:54 +00:00
TreeHugger Robot
ceb7aefd6f Merge "Sanitize more of the notification text fields" into rvc-dev 2020-09-09 23:55:10 +00:00
Julia Reynolds
aa1073f47f [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours am: db4d949ee2 -s ours am: 31accf77d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512683

Change-Id: Ia6c7c59430c8075af11b957723831e58f593acff
 2020-09-09 23:17:21 +00:00
TreeHugger Robot
830e2cbbce Merge "Accept repeated locale as an input of LocaleList construction." into rvc-dev am: 5cacc10912 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513781

Change-Id: I523bd094a53e01c06450d726ed4ee75e5156b362
 2020-09-09 23:00:33 +00:00
Julia Reynolds
31accf77d8 [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours am: db4d949ee2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If516e824730abcd5523d174045f7f53a6afceb1c
 2020-09-09 23:00:19 +00:00
TreeHugger Robot
5cacc10912 Merge "Accept repeated locale as an input of LocaleList construction." into rvc-dev 2020-09-09 22:38:02 +00:00
Julia Reynolds
db4d949ee2 [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a7e611a7eab7666a787f7bc120703704ae5e345
 2020-09-09 22:32:12 +00:00
Seigo Nonaka
9555d60871 Accept repeated locale as an input of LocaleList construction. am: 41b1674f77 am: 8b4cd9aef3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12540040

Change-Id: I5e6889206dc08d4475695ed619c5b5fc1423e6a0
 2020-09-09 20:57:57 +00:00
Seigo Nonaka
8b4cd9aef3 Accept repeated locale as an input of LocaleList construction. am: 41b1674f77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12540040

Change-Id: I69509d7ddadb1787f56ce31f0ff2fb617537b2ce
 2020-09-09 20:33:10 +00:00
Tiger Huang
d541d1d4fd Update requested state after applying pending frames am: dfc8abb1ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12526908

Change-Id: I40156abe8952ae5b9ed36b3bc6ae5b854380e14e
 2020-09-09 19:30:32 +00:00
Jooyung Han
bcb603908d [automerger skipped] Merge "statsd: mark libstats_jni as jni_libs" into stage-aosp-master am: 14a6871e43 -s ours 
am skip reason: Change-Id Ie32e88355828c8f696cce9d128eebb6da70026f1 with SHA-1 39c94c0493 is in history

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

Change-Id: Ie2c809af0845894a98152fd1ac2f43430f4dae65
 2020-09-09 07:58:02 +00:00
Sergey Nikolaienkov
4bf2a8e322 Merge "Add GET_INTENT_SENDER_INTENT permission to Shell" am: 104d2f92b3 am: ec82033d3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1385856

Change-Id: I3a835c92cf86985d6861382f33c58d5df000f2d7
 2020-09-09 07:57:43 +00:00
Jooyung Han
14a6871e43 Merge "statsd: mark libstats_jni as jni_libs" into stage-aosp-master 2020-09-09 07:35:37 +00:00
Sergey Nikolaienkov
ec82033d3e Merge "Add GET_INTENT_SENDER_INTENT permission to Shell" am: 104d2f92b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1385856

Change-Id: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
 2020-09-09 07:23:52 +00:00
Sergey Nikolaienkov
104d2f92b3 Merge "Add GET_INTENT_SENDER_INTENT permission to Shell" 2020-09-09 07:09:11 +00:00
Jooyung Han
fa78ddbdc8 statsd: mark libstats_jni as jni_libs 
This helps the build system to convey the information to linkerconfig so
that jni_libs are available via libnativeloader.

Bug: 168077238
Bug: 150767721
Test: presubmit
Merged-In: Ie32e88355828c8f696cce9d128eebb6da70026f1
Change-Id: Ie32e88355828c8f696cce9d128eebb6da70026f1
(cherry picked from commit 95642bbc3f)
(cherry picked from commit 39c94c0493)
 2020-09-09 06:15:32 +00:00
Seigo Nonaka
41b1674f77 Accept repeated locale as an input of LocaleList construction. 
Repeated locale has not been accepted and IllegalArgumentException
is thrown. Instead of throwing exception, dropping repeated locale
instead.

Bug: 152410253
Test: atest LocaleListTest
Change-Id: I80f243678ac3024eaeb0349f770cff897df7f332
 2020-09-08 20:22:48 +00:00
Brad Ebinger
ee81b81b29 Merge "Update OWNERS" am: 33082d4490 am: f3670cc3d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418955

Change-Id: I70f5e24c8ab83c2aea787757ae713a1d99a74fb6
 2020-09-08 19:44:58 +00:00
Brad Ebinger
f3670cc3d3 Merge "Update OWNERS" am: 33082d4490 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418955

Change-Id: Ia358e7f028c9fbbb80aa03e714f652c251a6fd9b
 2020-09-08 19:20:53 +00:00
Brad Ebinger
33082d4490 Merge "Update OWNERS" 2020-09-08 18:37:07 +00:00
Treehugger Robot
3b71c8c742 Merge "Move PropertyMap from libutils to libinput" am: bf37f0d136 am: 27e25ee89e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419037

Change-Id: Id12efbec6c7192afb0cb0e987fa8698d5b86f0c8
 2020-09-08 16:22:37 +00:00
Treehugger Robot
4d279afec1 Merge "android.os.Binder: remove unused getFinalizer" am: c59758ab41 am: e98c205ba8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418956

Change-Id: Ia3996b2e60afdb8944b431501ee90e3c1997b8c2
 2020-09-08 16:22:14 +00:00
Treehugger Robot
27e25ee89e Merge "Move PropertyMap from libutils to libinput" am: bf37f0d136 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419037

Change-Id: I79f94c2c458d3314246cbe0980b28acac4d97cb4
 2020-09-08 16:17:05 +00:00
Treehugger Robot
bf37f0d136 Merge "Move PropertyMap from libutils to libinput" 2020-09-08 16:03:36 +00:00
Treehugger Robot
e98c205ba8 Merge "android.os.Binder: remove unused getFinalizer" am: c59758ab41 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418956

Change-Id: Ia8f7da7e819eaa5080412efe86b7c9d96bb7b971
 2020-09-08 15:45:15 +00:00
Treehugger Robot
c59758ab41 Merge "android.os.Binder: remove unused getFinalizer" 2020-09-08 15:26:56 +00:00
Julia Reynolds
f6f287a1ef DO NOT MERGE Sanitize more of the notification text fields 
Test: manual; monitor SystemUI performance when an app tries to
post a messaging style notification with messages with long text
Bug: 158304295
Bug: 147358092

Merged-In: c953fdf6bc
Change-Id: I0e2ea12fc3351b1a56645b556720ea2306f5422a
(cherry picked from commit c953fdf6bc)
 2020-09-08 15:13:59 +00:00
Anton Hansson
c7ecd67a69 Merge "Revert "Add updatable-media jarjar rules to framework-all"" into rvc-dev-plus-aosp 2020-09-08 14:40:09 +00:00
Anton Hansson
f5b867d3f1 Merge the framework-defaults into framework-minus-apex am: 3e20672380 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12534238

Change-Id: Iaae1ddc15cf3162fcd051f3682f43c80ae64f325
 2020-09-08 13:39:54 +00:00
Anton Hansson
5febf61a72 Make framework-all composed of other framework jars am: 7a9bc4eb26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513173

Change-Id: I3c303f8aa27db0379d16c1194638079367f011c4
 2020-09-08 08:40:18 +00:00
Anton Hansson
631291cd32 Revert "Add updatable-media jarjar rules to framework-all" 
We no longer need this jarjar rule because we are not re-compiling
exoplayer.

This reverts commit f92d07e5f9.

Bug: 149906971
Test: m && \
      unzip -l out/soong/.intermediates/frameworks/base/framework-all/\
      android_common/combined/framework-all.jar \
      | grep exo \
      | grep -v internal
      (no exoplayer classes)
Change-Id: Ic4d7847875797be47e02987337bf685bfe1e6605
 2020-09-07 15:08:06 +00:00
Anton Hansson
3e20672380 Merge the framework-defaults into framework-minus-apex 
As of I1cea62aaedb7e653648130e3d315761c0c9aece4, there is only
one user of framework-defaults, so the separate defaults are no longer
needed.

Test: m
Change-Id: Ia06b50195dcf7de076664af4592616be5264ae21
Merged-In: Ia06b50195dcf7de076664af4592616be5264ae21
 2020-09-07 14:41:30 +01:00
Anton Hansson
0dc6f2375d Merge "Simplify module visibility post build refactor" into stage-aosp-master am: 1d35b7bc24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513172

Change-Id: Iff37388324c3fb1e838c3c7ffc803b96d6e61197
 2020-09-07 08:22:05 +00:00
Anton Hansson
7a9bc4eb26 Make framework-all composed of other framework jars 
This avoids duplicating the compilation of the module java source
code, as well as maintaining the compilation rules in two places.

Bug: 149906971
Test: m FrameworkServicesRoboTests
Change-Id: I1cea62aaedb7e653648130e3d315761c0c9aece4
Merged-In: I1cea62aaedb7e653648130e3d315761c0c9aece4
 2020-09-07 09:14:50 +01:00
Anton Hansson
1d35b7bc24 Merge "Simplify module visibility post build refactor" into stage-aosp-master 2020-09-07 08:09:53 +00:00
Tiger Huang
dfc8abb1ff Update requested state after applying pending frames 
When there is an insets animation, we will stop updating insets source
frames until the animation is done. The previous logic didn't update the
frames within the requested state while the animation is done. And the
frames was relied by InsetsPolicy while playing transient bar animation.
If the frames don't match the display, the insets would be wrong, and
the animation wouldn't be played correctly.

Fix: 161134197
Test: atest InsetsControllerTest
Merged-In: Id8f3c1956fbfe3ad16f167ff76297dde6c634e81
Change-Id: Id8f3c1956fbfe3ad16f167ff76297dde6c634e81
(cherry picked from commit 23c75281ef)
 2020-09-07 16:09:08 +08:00
Anton Hansson
46c47efca2 Simplify module visibility post build refactor 
//visibility:override is no longer needed for impl_library_visibility
to override visibility.

Removing this allows the defaults module to specify better defaults.

- Stub libraries are made publicly visible, via `visibility`
- Impl libraries are private by default, but visibility is extended
  by the modules

Bug: 165017290
Test: m
Exempt-From-Owner-Approval: build refactor
Change-Id: Ibf35bfac5c99a21125f89ba10945f3364217b90f
 2020-09-07 07:54:50 +00:00
Treehugger Robot
267e6ffd2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 90b0d3f83e -s ours am: 228aa6e038 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1bd570ab0bf5aebc2ef61ea9844de6b93c9b72e
 2020-09-06 06:49:20 +00:00
Treehugger Robot
e445a9438d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a2418b59c7 -s ours am: b26a82e212 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7815cf85faa06b0331044e5b4ffd2561d2ec97c1
 2020-09-06 06:49:13 +00:00
Treehugger Robot
75cec2db9e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e012e327c7 -s ours am: 5530f09269 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I444bb656f440dcd20a5922cc5807faf577271da8
 2020-09-06 06:49:05 +00:00
Treehugger Robot
028ad0a064 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5443e7b99d -s ours am: b55d292da6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib9aa9388d06ee105f654b32110714c618bd07412
 2020-09-06 06:48:35 +00:00
Treehugger Robot
228aa6e038 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 90b0d3f83e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f6c063e80cc2b24e3811105256b00e085f55410
 2020-09-06 06:43:36 +00:00
Treehugger Robot
b26a82e212 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a2418b59c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9102a96a0cb816b895ccf93a174dc6e91e59ee5a
 2020-09-06 06:40:58 +00:00
Treehugger Robot
5530f09269 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e012e327c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76ab5b52796e0dbf51611db3607666686648399f
 2020-09-06 06:38:44 +00:00
Treehugger Robot
90b0d3f83e Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-06 06:38:16 +00:00
Treehugger Robot
b55d292da6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5443e7b99d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic09f7bf8b025fd9479b2e71c266d89d4d154fb19
 2020-09-06 06:36:18 +00:00
Treehugger Robot
a2418b59c7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-06 06:27:36 +00:00
Treehugger Robot
e012e327c7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-06 06:25:56 +00:00