Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
530,366 Commits 3 Branches 0 Tags
04dede7600a0da25fa29fedd9a9ae493bfc0bf0c
Commit Graph

530366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
1b2341bded [automerger skipped] Merge "Allow module libs to use VINTF AIDL (part II)" am: 1054fd8e86 am: 3719bd9cd0 -s ours am: f73a22aa44 -s ours 
am skip reason: Change-Id Idc2acb28ac0475ee69385487c7ef619951f93516 with SHA-1 e5bd46e639 is in history

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

Change-Id: I1003b00b88d1fb8a10fe9ce8199df7af9f2c5c3b
 2020-07-28 20:34:36 +00:00
Treehugger Robot
19847945d9 Merge "Update language to comply with Android's inclusive language guidance" am: feee9563e1 am: d5b8b0db79 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374618

Change-Id: I28545b3ef78321bc0e4f7240f20da3f819a6e46d
 2020-07-28 20:34:33 +00:00
Treehugger Robot
47ae97cf2a Merge "Update language to comply with Android's inclusive language guidance" am: 17867fdf87 am: 0071fe0249 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373531

Change-Id: I66ac5c84d1b5230657c867bf36bf7d0f5a4cd785
 2020-07-28 20:33:40 +00:00
Nate Jiang
d742870221 Merge "Revert "Make broadcast protected"" into rvc-d1-dev am: 243cd3ec1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12241970

Change-Id: I74760f6ebe563c9350a407f766bff77e74c5b445
 2020-07-28 20:33:08 +00:00
Treehugger Robot
ff0a6eab18 Merge "Update language to comply with Android's inclusive language guidance" am: e211918c69 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373837

Change-Id: I2aa0d077920614b34042a4e74272950a3f2778d3
 2020-07-28 20:10:39 +00:00
Treehugger Robot
d5b8b0db79 Merge "Update language to comply with Android's inclusive language guidance" am: feee9563e1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374618

Change-Id: I8cf1f4696e8c4cc138ba38f8c5fee03f9b0e079d
 2020-07-28 20:10:21 +00:00
Treehugger Robot
0071fe0249 Merge "Update language to comply with Android's inclusive language guidance" am: 17867fdf87 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373531

Change-Id: I6d77fea8fa1688d2883be492f8d5f5550e52d1a4
 2020-07-28 20:09:52 +00:00
Treehugger Robot
e211918c69 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-28 20:08:52 +00:00
Treehugger Robot
feee9563e1 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-28 20:02:52 +00:00
Nate Jiang
243cd3ec1a Merge "Revert "Make broadcast protected"" into rvc-d1-dev 2020-07-28 20:02:42 +00:00
Treehugger Robot
f73a22aa44 [automerger skipped] Merge "Allow module libs to use VINTF AIDL (part II)" am: 1054fd8e86 am: 3719bd9cd0 -s ours 
am skip reason: Change-Id Idc2acb28ac0475ee69385487c7ef619951f93516 with SHA-1 e5bd46e639 is in history

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

Change-Id: I10acf31ada3afd4bc7f1b413a441eb278db7c5fa
 2020-07-28 19:59:22 +00:00
Treehugger Robot
17867fdf87 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-28 19:51:51 +00:00
Treehugger Robot
3719bd9cd0 Merge "Allow module libs to use VINTF AIDL (part II)" am: 1054fd8e86 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373823

Change-Id: I84d065e93e8b7b3b8de3a498304c22f69ca6809d
 2020-07-28 19:43:14 +00:00
Treehugger Robot
1054fd8e86 Merge "Allow module libs to use VINTF AIDL (part II)" 2020-07-28 19:25:45 +00:00
Treehugger Robot
24b4700df1 Merge "Fix Docs for KEY_CARRIER_SUPPORTS_SS_OVER_UT_BOOL" am: 2d78a290d4 am: a636ce731f am: e2dedb294e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371275

Change-Id: I99adbcf35a246e819b317460bd69be5bb305807a
 2020-07-28 18:57:44 +00:00
Peiyong Lin
057d3ace10 Merge "Use more inclusive terms inside GraphicsEnvironment." into rvc-dev-plus-aosp am: adda6254d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12245299

Change-Id: Ibccd82b97a3baf95aee0407eedc6da428237e2ca
 2020-07-28 18:57:07 +00:00
Treehugger Robot
e2dedb294e Merge "Fix Docs for KEY_CARRIER_SUPPORTS_SS_OVER_UT_BOOL" am: 2d78a290d4 am: a636ce731f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371275

Change-Id: I10b4492decf398234c6feff0d46f07ab9d41d7c9
 2020-07-28 18:47:08 +00:00
Peiyong Lin
adda6254d8 Merge "Use more inclusive terms inside GraphicsEnvironment." into rvc-dev-plus-aosp 2020-07-28 18:41:08 +00:00
Curtis Belmonte
2887ec0b15 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference
 
Test: Presubmit
Bug: 161896447

Change-Id: I7fb8abdb8e3ca65d29a40bd7f6f090aefaa0765f
 2020-07-28 18:40:45 +00:00
Curtis Belmonte
5ef7992d3c Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference
 
Test: Presubmit
Bug: 161896447

Change-Id: If0192e33d6d063c7dfda72af1509a3fbd16e3044
 2020-07-28 18:35:45 +00:00
Treehugger Robot
a636ce731f Merge "Fix Docs for KEY_CARRIER_SUPPORTS_SS_OVER_UT_BOOL" am: 2d78a290d4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371275

Change-Id: I819e34e5297fe444e2961dea87b0f3fe58c82e5c
 2020-07-28 18:29:23 +00:00
Steven Moreland
93bdd4451a Merge "Allow module libs to use VINTF AIDL (part II)" into rvc-dev-plus-aosp am: 31457aebae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12244505

Change-Id: I9ad6a962366490ba2cc409ea15dc2cda25be650d
 2020-07-28 18:28:53 +00:00
Lorenzo Colitti
8bd03344c7 Set the NetworkInfo subtype to 0. am: a40ff70cad am: 7d9a9213fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826

Change-Id: I6b8d22c0bf3a19f8c661e67454f80ae55f466842
 2020-07-28 18:28:43 +00:00
Lorenzo Colitti
e90c22ad7b Set the NetworkInfo subtype to 0. am: a40ff70cad am: 4034ddfa74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826

Change-Id: I8a54c8fa4c51d74f6e8b1dc98dad71208f4e3836
 2020-07-28 18:27:25 +00:00
Curtis Belmonte
403adb7b7c Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Change-Id: Iaada83171b81a798db1e7c413e8e0c4d1f3d9a55
Test: Presubmit
Bug: 161896447
 2020-07-28 18:16:41 +00:00
Steven Moreland
31457aebae Merge "Allow module libs to use VINTF AIDL (part II)" into rvc-dev-plus-aosp 2020-07-28 18:14:20 +00:00
Lorenzo Colitti
7d9a9213fb Set the NetworkInfo subtype to 0. am: a40ff70cad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826

Change-Id: Ida8cd0788ae34f4861fbcb958163b5074258c6ac
 2020-07-28 18:05:15 +00:00
Lorenzo Colitti
4034ddfa74 Set the NetworkInfo subtype to 0. am: a40ff70cad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826

Change-Id: If570350574c5113763bb86943a27b9330db6b9ad
 2020-07-28 18:05:12 +00:00
Treehugger Robot
2d78a290d4 Merge "Fix Docs for KEY_CARRIER_SUPPORTS_SS_OVER_UT_BOOL" 2020-07-28 18:02:50 +00:00
Treehugger Robot
bb50f0e74c Merge "Expose adhoc conference calling API as public." am: 8ebbe3c038 am: fb8f41f0c2 am: e8a4750ac5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1368819

Change-Id: I9c47ae98bd0a1d5e529a2d59c0fd1657ae061a53
 2020-07-28 17:58:37 +00:00
Nathan Harold
69cd49e502 Merge "Update Docstrings for #requestLocationUpdate()" am: abe015171f am: d3467070fc am: abfeabcb33 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372239

Change-Id: I9ca0bd863594d7230257605e2b031754449166e5
 2020-07-28 17:57:11 +00:00
Treehugger Robot
e8a4750ac5 Merge "Expose adhoc conference calling API as public." am: 8ebbe3c038 am: fb8f41f0c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1368819

Change-Id: Ia5e17f2dbbfbb539f2415348e1ddb960354d3662
 2020-07-28 17:41:13 +00:00
Nathan Harold
abfeabcb33 Merge "Update Docstrings for #requestLocationUpdate()" am: abe015171f am: d3467070fc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372239

Change-Id: I9542a65e37015e89681e3da0a52b20efc365a0e8
 2020-07-28 17:40:41 +00:00
Treehugger Robot
fb8f41f0c2 Merge "Expose adhoc conference calling API as public." am: 8ebbe3c038 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1368819

Change-Id: Ie318c734d41d8b671de4c6bd6d55ca3c8bbb8dea
 2020-07-28 17:20:46 +00:00
Nathan Harold
d3467070fc Merge "Update Docstrings for #requestLocationUpdate()" am: abe015171f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372239

Change-Id: Ib5d95609b923a22c009b3e3eaa4c492480e0c2ff
 2020-07-28 17:19:56 +00:00
Ivan Lozano
8b7f939789 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

 #inclusivefixit

Also re-order incorrectly ordered imports.

Bug: 161896447
Test: mma
Change-Id: Icc876290ca169ebfddba1975de9f28a39ec863ab
 2020-07-28 13:17:57 -04:00
Treehugger Robot
8ebbe3c038 Merge "Expose adhoc conference calling API as public." 2020-07-28 17:08:47 +00:00
Nate Jiang
fc974f2893 Revert "Make broadcast protected" 
Revert submission 12228948-cherrypick-imsiFlow-cq2jn82jd4

Reason for revert: protect broadcast by NETWORK_SETTINGS permission
Reverted Changes:
I8be7c1b9e:Update IMSI protection notification flow
I0cd36cb60:Make broadcast protected
Bug: 161932419

Change-Id: I39bf4da17bd639564f150370167ad6e567e125a0
 2020-07-28 17:06:06 +00:00
Joel Galenson
4143080a6d Update comment to use inclusive language 
See https://source.android.com/setup/contribute/respectful-code for reference.

#inclusivefixit

Bug: 161896447
Test: None
Change-Id: I1b24350f4e4528ff40ef8d9065a2c5c4251c5059
 2020-07-28 17:02:22 +00:00
Nathan Harold
abe015171f Merge "Update Docstrings for #requestLocationUpdate()" 2020-07-28 17:01:47 +00:00
Liz Kammer
74ac03aaac Merge "Convert uiautomator-stubs-docs to use metalava" am: 0a35d9f797 am: 2f47f7eca3 am: 17ab9a9452 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365298

Change-Id: Ieef0d06130faaddb10eee97e9efe0ca1a5bcd733
 2020-07-28 16:58:39 +00:00
Treehugger Robot
35d1fb2ad2 Merge "Update language to comply with Android's inclusive language guidance" am: 296355cba3 am: a5958c2cba am: 36efe13de9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373419

Change-Id: I1f4becb31d39e151e64fc18ab420c23a6682eed7
 2020-07-28 16:58:22 +00:00
Bill Yi
ba1245d651 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70441941ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I595e1212e2499e4e569a471989f6533accd1def2
 2020-07-28 16:49:19 +00:00
Liz Kammer
17ab9a9452 Merge "Convert uiautomator-stubs-docs to use metalava" am: 0a35d9f797 am: 2f47f7eca3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365298

Change-Id: I9d5e389e9ef95ba7d4235713e600e0d4d9a743db
 2020-07-28 16:42:40 +00:00
Treehugger Robot
36efe13de9 Merge "Update language to comply with Android's inclusive language guidance" am: 296355cba3 am: a5958c2cba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373419

Change-Id: I3a82e2d9f8d567ab4773fe96903cf5413f9321eb
 2020-07-28 16:42:25 +00:00
Victor Chang
1bc370696c Link CalendarAstronomer statically in the system server 
Stop-gap measure to allow TwilightService to fork
the implementation of CalendarAstronomer or use its own
implementation, and remove the @CorePlatformApi.

Bug: 139480281
Bug: 134508682
Test: m droid
Change-Id: Id75fefe4f66a386a1c072f8b2e0bdbd0f642bb4b
 2020-07-28 17:33:52 +01:00
Liz Kammer
2f47f7eca3 Merge "Convert uiautomator-stubs-docs to use metalava" am: 0a35d9f797 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365298

Change-Id: I94cb52829429b7bb9e0b960c2a08bbe5c7b88a45
 2020-07-28 16:30:41 +00:00
Treehugger Robot
a5958c2cba Merge "Update language to comply with Android's inclusive language guidance" am: 296355cba3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373419

Change-Id: Ia10debc21d4d65e2e7b7b9e16ab96956a56426c9
 2020-07-28 16:30:12 +00:00
Liz Kammer
0a35d9f797 Merge "Convert uiautomator-stubs-docs to use metalava" 2020-07-28 16:15:06 +00:00
Treehugger Robot
296355cba3 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-28 16:13:18 +00:00