Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
494,786 Commits 3 Branches 0 Tags
779a1aedd5a5d830cd46cfaba437995527af0876
Commit Graph

494786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kelly Rossmoyer
779a1aedd5 Merge "Update language to comply with Android's inclusive language guidance" am: f8476d358f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377954

Change-Id: I1675a1ac16f0f0529ba28a96f8351cee043538f6
 2020-09-11 01:12:37 +00:00
Treehugger Robot
56f0f3a67b Merge "Expose some carrier config keys for RTT" am: 4fb19f1550 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1423856

Change-Id: I6b67e46aa5b421f974578fdd1b194d6166d50875
 2020-09-11 01:05:05 +00:00
Xin Li
b9db5b54f6 [automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours 
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

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

Change-Id: I4556c20984240fd32561e6b70f772b94934e5908
 2020-09-11 00:40:06 +00:00
Anton Hansson
2547a73809 Merge "Add owners file for all bp files in apex subdir" am: 3de940cc40 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1423349

Change-Id: I07af3c4a688a105376ce4297f7f8e967a18f13ec
 2020-09-10 23:23:26 +00:00
Kelly Rossmoyer
f8476d358f Merge "Update language to comply with Android's inclusive language guidance" 2020-09-10 23:07:11 +00:00
Treehugger Robot
4fb19f1550 Merge "Expose some carrier config keys for RTT" 2020-09-10 21:39:25 +00:00
Kelly Rossmoyer
2837883e87 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

BUG=161896447

Test: make (change is only comments + 1 log message)

Change-Id: I8a21ef4ce19c517853388d8f7542f3a0cf8d91d5
Merged-In: I26ef8e079bf13f19bdc3bbc8219f572a43b68090
 2020-09-10 13:55:33 -07:00
Hall Liu
6c0206ae4f Expose some carrier config keys for RTT 
These keys were added at some point in the past when the API window for
a release had already passed. Expose these constants for use by apps.

Fixes: 149906782
Test: NA -- constants only
Change-Id: I34c34b05f559ab3424bce42ec61bae3572ff6f8d
 2020-09-10 12:22:20 -07:00
Treehugger Robot
c4f395d361 Merge "Change Czech keyboard default layout to qwertz" am: 23ddddef15 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1417617

Change-Id: I72dfc4f664c397c254c5106603616faa152da8cf
 2020-09-10 18:11:29 +00:00
Xin Li
8ac6741e47 Merge "Merge Android R" 2020-09-10 17:22:01 +00:00
Anton Hansson
3de940cc40 Merge "Add owners file for all bp files in apex subdir" 2020-09-10 17:19:35 +00:00
Treehugger Robot
23ddddef15 Merge "Change Czech keyboard default layout to qwertz" 2020-09-10 16:40:20 +00:00
Anton Hansson
14eba557fb Add owners file for all bp files in apex subdir 
This is a frequent area of build refactoring.

Test: No
Change-Id: I7582fc3bfa00d2bff74012d6aa31a4b236b916f8
 2020-09-10 16:28:08 +01:00
Xin Li
c64112eb97 Merge Android R 
Bug: 168057903
Merged-In: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
Change-Id: I1d85742f594be2007c99841b290e502b6ede624e
 2020-09-09 20:21:10 -07: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
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
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
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
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
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
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
Treehugger Robot
5443e7b99d Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-06 06:23:48 +00:00
Bill Yi
765175e50a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I729ec6ac98a95690838697c28220b11b0f1b0399
 2020-09-05 21:39:23 -07:00
Bill Yi
9f6c0a988b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2901e3fe1992468b4f2a29d291199e1a5a10b456
 2020-09-05 19:50:47 -07:00
Treehugger Robot
0d0783929a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 43a1b4cac2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ed41e86f373bbcc9e97edbb3ee08dbc411af35a
 2020-09-06 02:43:19 +00:00
Treehugger Robot
70e59c5f79 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 70d09036bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb5d2cbfa9a9a1d065759a07ba4c34862bbdee51
 2020-09-06 02:40:14 +00:00
Treehugger Robot
9681f759e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8f2203e459 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf6d80885ff440219d251a3556e6990888e51d71
 2020-09-06 02:37:08 +00:00
Treehugger Robot
43a1b4cac2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-06 02:33:36 +00:00
Treehugger Robot
70d09036bd Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-06 02:32:06 +00:00
Bill Yi
07203b5078 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I62f3de9742c081ec3b41669f5ff6a49be6bba75a
 2020-09-05 19:23:28 -07:00
Treehugger Robot
8f2203e459 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-06 02:17:28 +00:00
Bill Yi
6e46f8c92d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I26c34ae25235ef3a8159eeacce5d67d06ff3f051
 2020-09-05 18:56:08 -07:00
Bill Yi
ea316a2f73 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9724f497ac634d08eebed2fa0d0e642ddb516a99
 2020-09-05 18:28:32 -07:00
Bill Yi
005ead84c5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie60f359aea7cd333ec0801e1c6a901f70e45017a
 2020-09-05 18:01:19 -07:00
Bill Yi
673d2179bf Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iff53370b7d738b22e8ef07d2f642db9680c31a24
 2020-09-05 17:33:59 -07:00
Treehugger Robot
47c1d3f7a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8d9e8ba822 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2925d55ed851b91137de7e23ef87cff710083f93
 2020-09-05 14:18:57 +00:00