Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
517,036 Commits 3 Branches 0 Tags
da9fd82cd3ac68dd7e84cf12ce01c13c46644413
Commit Graph

517036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrei-Valentin Onea
da9fd82cd3 Merge "Drop deprecated API lists from csv merge script" am: 269f58445d am: 33afbc9347 am: 3c8464e035 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392982

Change-Id: I5459bb5b6cc8741b1128822fa9d5d1a11515df5f
 2020-08-13 14:35:20 +00:00
Andrei-Valentin Onea
3c8464e035 Merge "Drop deprecated API lists from csv merge script" am: 269f58445d am: 33afbc9347 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392982

Change-Id: Icb900741395045bb16853cc18cf5aeafa4ef08d2
 2020-08-13 14:16:02 +00:00
Andrei-Valentin Onea
33afbc9347 Merge "Drop deprecated API lists from csv merge script" am: 269f58445d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392982

Change-Id: I495d09f69d23fe935c2b4141f15b164ff0c862ce
 2020-08-13 13:58:45 +00:00
Andrei-Valentin Onea
269f58445d Merge "Drop deprecated API lists from csv merge script" 2020-08-13 13:42:13 +00:00
Sudheer Shanka
e64b3e7ba8 Merge "Update language to comply with Android’s inclusive language guidance." into rvc-dev-plus-aosp am: 7f61eb2622 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12347904

Change-Id: I5b9a25710e5088c525fde0416b770d25017c70b2
 2020-08-13 07:14:54 +00:00
Sudheer Shanka
7f61eb2622 Merge "Update language to comply with Android’s inclusive language guidance." into rvc-dev-plus-aosp 2020-08-13 07:01:06 +00:00
Sudheer Shanka
759c96a3d4 Update language to comply with Android’s inclusive language guidance. 
See https://source.android.com/setup/contribute/respectful-code for reference

Leaving the power save whitelists as is for now. These will be handled
in a follow-up cl.

Bug: 161896447
Test: atest ./hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Test: atest ./services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java
Change-Id: I5059d8362a02a7b4622c71fdf15297af87c5a3dd
Merged-In: I5059d8362a02a7b4622c71fdf15297af87c5a3dd
Exempt-From-Owner-Approval: clean cherrypick
(cherry picked from commit 76e523aa00)
 2020-08-13 06:59:40 +00:00
Chalard Jean
a0794291ec Merge "Rename Kotlin util files to not include the Kt suffix" am: b1a3247ab4 am: 9da93f616e am: 70572e1b82 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I6d7b924f9c0e8722400611cec31b4bf4222548ad
 2020-08-13 04:43:45 +00:00
Chalard Jean
70572e1b82 Merge "Rename Kotlin util files to not include the Kt suffix" am: b1a3247ab4 am: 9da93f616e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I6362695120ea8669e1da84bb686e886b85efd6a3
 2020-08-13 04:26:11 +00:00
Chalard Jean
9da93f616e Merge "Rename Kotlin util files to not include the Kt suffix" am: b1a3247ab4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I7e1f015c21d54591a1a25b5fa461e751bc707509
 2020-08-13 04:09:27 +00:00
Treehugger Robot
e3538bc744 Merge "Remove bluetooth address from logs in SettingsLib" am: 4ad4ca07bb am: 2918f0ef46 am: 0e9d68e890 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397949

Change-Id: I7c162efccbeda3d669a784cc9bbaffbc339a123d
 2020-08-13 04:01:20 +00:00
Chalard Jean
b1a3247ab4 Merge "Rename Kotlin util files to not include the Kt suffix" 2020-08-13 03:52:47 +00:00
Treehugger Robot
0e9d68e890 Merge "Remove bluetooth address from logs in SettingsLib" am: 4ad4ca07bb am: 2918f0ef46 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397949

Change-Id: I3ef3df5cb8c99c97770ced51a7c8e0dff5f629a7
 2020-08-13 03:44:13 +00:00
Treehugger Robot
2918f0ef46 Merge "Remove bluetooth address from logs in SettingsLib" am: 4ad4ca07bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397949

Change-Id: Ic14a585b51e106c7d363fcd1231e5cd884c5727b
 2020-08-13 03:29:24 +00:00
Treehugger Robot
4ad4ca07bb Merge "Remove bluetooth address from logs in SettingsLib" 2020-08-13 03:13:22 +00:00
Hans Boehm
6b9c4df784 Merge "API and boot image updates to import RI BigInteger" am: 47ce951f33 am: 2996c1be22 am: 7949fea1f9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331800

Change-Id: I819029d39b513cd6b2bef7158ae3e5dc0967be80
 2020-08-13 01:17:07 +00:00
Hans Boehm
7949fea1f9 Merge "API and boot image updates to import RI BigInteger" am: 47ce951f33 am: 2996c1be22 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331800

Change-Id: I497efcccc6d456789a9b095942681625e93334ff
 2020-08-13 00:51:24 +00:00
Hans Boehm
2996c1be22 Merge "API and boot image updates to import RI BigInteger" am: 47ce951f33 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331800

Change-Id: I67884decf7971ba52fbab365ef83e9f5610fc2d1
 2020-08-13 00:35:03 +00:00
Hans Boehm
47ce951f33 Merge "API and boot image updates to import RI BigInteger" 2020-08-13 00:15:01 +00:00
Tyler Gunn
4a68a87715 [automerger skipped] Merge "Improve remote connection logging." am: 560c97bc25 am: 6fc6f4f615 -s ours am: d7f7f43f03 -s ours 
am skip reason: Change-Id I916750e0f558db1eb9e581bab7a9fbc71f781709 with SHA-1 972a6ef338 is in history

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

Change-Id: I321ef9a82c9303d0693a625716d8088b1319960a
 2020-08-12 19:31:13 +00:00
Tyler Gunn
1c0e198f55 [automerger skipped] Merge "Fix createLaunchEmergencyDialerIntent API behavior when Telecom unavailable." am: 419c0fa22e am: e3051550fd -s ours am: 52bf8ea08e -s ours 
am skip reason: Change-Id I1665d456dace8e41cc035e792f319d98dd07219c with SHA-1 28ba067389 is in history

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

Change-Id: Ic765bc2cad10a20404c428ca58d3e7ec6512a7dd
 2020-08-12 19:30:41 +00:00
Tyler Gunn
d7f7f43f03 [automerger skipped] Merge "Improve remote connection logging." am: 560c97bc25 am: 6fc6f4f615 -s ours 
am skip reason: Change-Id I916750e0f558db1eb9e581bab7a9fbc71f781709 with SHA-1 972a6ef338 is in history

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

Change-Id: Ifb5c146a1f3a0939529ba910e3d9880186d4d9b1
 2020-08-12 19:12:56 +00:00
Tyler Gunn
52bf8ea08e [automerger skipped] Merge "Fix createLaunchEmergencyDialerIntent API behavior when Telecom unavailable." am: 419c0fa22e am: e3051550fd -s ours 
am skip reason: Change-Id I1665d456dace8e41cc035e792f319d98dd07219c with SHA-1 28ba067389 is in history

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

Change-Id: I126739bf23b48f485e5f033583e18ae5bca0fba6
 2020-08-12 19:12:44 +00:00
Tyler Gunn
6fc6f4f615 Merge "Improve remote connection logging." am: 560c97bc25 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392011

Change-Id: I06e1b087ff16046065bd651ddc14c4c3774051ba
 2020-08-12 18:56:42 +00:00
Tyler Gunn
e3051550fd Merge "Fix createLaunchEmergencyDialerIntent API behavior when Telecom unavailable." am: 419c0fa22e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392010

Change-Id: Ib3534f85ddc45d21f0cd034c6971162933a2a917
 2020-08-12 18:55:54 +00:00
Tyler Gunn
560c97bc25 Merge "Improve remote connection logging." 2020-08-12 18:27:36 +00:00
Tyler Gunn
419c0fa22e Merge "Fix createLaunchEmergencyDialerIntent API behavior when Telecom unavailable." 2020-08-12 18:27:18 +00:00
Adrian Roos
a9d806ec0b Merge changes I05b83c47,I5a840ec1 am: 49c52755d2 am: befa7e20f7 am: 9e07e38369 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398233

Change-Id: I2e4ded90bf752cf2b9460226c0bd5b97df38b907
 2020-08-12 18:21:37 +00:00
Adrian Roos
9e07e38369 Merge changes I05b83c47,I5a840ec1 am: 49c52755d2 am: befa7e20f7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398233

Change-Id: I15c7258ee3b45f7c9bf65e627140fe7fb3fccf95
 2020-08-12 18:01:26 +00:00
Adrian Roos
befa7e20f7 Merge changes I05b83c47,I5a840ec1 am: 49c52755d2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398233

Change-Id: I56b9faab494eacdcbfd6ca0df1b6684d7ee69d4f
 2020-08-12 17:46:33 +00:00
Adrian Roos
49c52755d2 Merge changes I05b83c47,I5a840ec1 
* changes:
  Introduce "Fallback InputConnection" term to comply with Android's inclusive language guidance
  Update InputMethodUtilsTest to comply with Android's inclusive language guidance
 2020-08-12 17:26:49 +00:00
Bradley Allen
0511cc91e9 Merge "docs: Removed Q preview language and added a link to the Android 10 page on developer.android.com." into rvc-dev am: 6dfedd05a7 am: 53cb3689e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12347462

Change-Id: Ie34c0ba16d25e95b1fcc533c2353710d93de692a
 2020-08-12 16:58:08 +00:00
Bradley Allen
94d6fae288 Merge "docs: Removed Q preview language and added a link to the Android 10 page on developer.android.com." into rvc-dev am: 6dfedd05a7 am: d015d7299a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12347462

Change-Id: Idfa103d97b06b8cee627909e5de387acd82f0173
 2020-08-12 16:57:07 +00:00
Bradley Allen
53cb3689e3 Merge "docs: Removed Q preview language and added a link to the Android 10 page on developer.android.com." into rvc-dev am: 6dfedd05a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12347462

Change-Id: I7745361a5d9fcda8359b8245a72d2f75e59f30c4
 2020-08-12 16:46:33 +00:00
Bradley Allen
d015d7299a Merge "docs: Removed Q preview language and added a link to the Android 10 page on developer.android.com." into rvc-dev am: 6dfedd05a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12347462

Change-Id: I7bd9a90e3b66e4a842bdcaa33f62328fd9928af7
 2020-08-12 16:46:29 +00:00
Bradley Allen
6dfedd05a7 Merge "docs: Removed Q preview language and added a link to the Android 10 page on developer.android.com." into rvc-dev 2020-08-12 16:38:01 +00:00
Chun-Wei Wang
cb6b00197d Merge "Update language to comply with Android's inclusive language guidance" am: a5d1ef9837 am: 51ded68601 am: 9b0cd12ce4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397950

Change-Id: I63e2a1c54969fc74f80657a63d98559eee312549
 2020-08-12 12:46:40 +00:00
Treehugger Robot
f1eb1e4233 Merge "Update language to comply with Android's inclusive language guidance" am: dd1415bbcd am: 50d99fe7c0 am: 82424fe412 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398112

Change-Id: I75a9378a46b2ebbb43784df34741afbf64c4542b
 2020-08-12 12:46:19 +00:00
Chun-Wei Wang
9b0cd12ce4 Merge "Update language to comply with Android's inclusive language guidance" am: a5d1ef9837 am: 51ded68601 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397950

Change-Id: Icb2ab0cfc29c8822d5e7f833622fa17357b1bbe9
 2020-08-12 12:30:01 +00:00
Treehugger Robot
82424fe412 Merge "Update language to comply with Android's inclusive language guidance" am: dd1415bbcd am: 50d99fe7c0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398112

Change-Id: I5f04dc2f3a2d94c1059aafddda0c2fd1209f675d
 2020-08-12 12:29:43 +00:00
Chun-Wei Wang
51ded68601 Merge "Update language to comply with Android's inclusive language guidance" am: a5d1ef9837 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397950

Change-Id: I87ef70146b5032409b8d6f87932641fa620add01
 2020-08-12 12:24:43 +00:00
Chun-Wei Wang
a5d1ef9837 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-12 12:18:41 +00:00
Treehugger Robot
50d99fe7c0 Merge "Update language to comply with Android's inclusive language guidance" am: dd1415bbcd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398112

Change-Id: I474986ba62b8b0c4ddad8491718aab690a7b2595
 2020-08-12 12:16:21 +00:00
Treehugger Robot
dd1415bbcd Merge "Update language to comply with Android's inclusive language guidance" 2020-08-12 11:59:45 +00:00
Adrian Roos
38a97a4947 Introduce "Fallback InputConnection" term to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 162536543
Test: make droid
Change-Id: I05b83c478e7a8bc95784ad448ed09248d92767ad
 2020-08-12 12:52:47 +02:00
Chiachang Wang
7ca59bc74f Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db am: 0e7aefd000 am: 139402e852 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: Ib078acdf9210f7c80b5cdb50ae5b860aea2a5626
 2020-08-12 10:28:50 +00:00
Chiachang Wang
139402e852 Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db am: 0e7aefd000 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: Ibe13b2dad841e2ade2762558d1c3978a89cb825d
 2020-08-12 10:10:11 +00:00
Adrian Roos
3481b24cd1 Update InputMethodUtilsTest to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 162536543
Test: atest InputMethodUtilsTest
Change-Id: I5a840ec11129be54a288c806d610248fd02bc21c
 2020-08-12 12:06:57 +02:00
Chiachang Wang
0e7aefd000 Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: Iecf8601b2f9e286cefca0675476d0892436d5e5b
 2020-08-12 09:52:30 +00:00
Lais Andrade
1077de0092 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

#inclusivefixit

BUG=162536543

Change-Id: Icee71d95970b20776b34bc9873a665662da2ae03
 2020-08-12 09:49:03 +00:00