Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
519,022 Commits 3 Branches 0 Tags
c19fd3c4cba0f02a1ef8a897a4aa6e00a6e3df93
Commit Graph

519022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
4cb1ece9d1 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-31 15:09:55 +00:00
Treehugger Robot
49fc83bc70 Merge "Update language to comply with Android's inclusive language guidance" am: ea575e7bc4 am: 0166574738 am: fd6b8e0da4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382385

Change-Id: I784c5050682c23e64796689caed846e0952bfed5
 2020-07-31 15:08:28 +00:00
Lais Andrade
778b7d6784 Merge "Update language to comply with Android's inclusive language guidance" am: 5db2bcffdf am: f8712712af am: 4614b73141 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382536

Change-Id: I7a450caded1b1b588734d26709d603480c999cd8
 2020-07-31 15:08:08 +00:00
Lais Andrade
d2ce0e0f17 Merge "Update language to comply with Android's inclusive language guidance" am: cb51202601 am: 6c6e238f23 am: 40bdc0c86f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382537

Change-Id: Iad19e0977aab66758c01a3b8448a8f432fa92d89
 2020-07-31 15:07:19 +00:00
Treehugger Robot
4aab6d6cfe Merge "Update language to comply with Android's inclusive language guidance" 2020-07-31 15:00:31 +00:00
Treehugger Robot
fd6b8e0da4 Merge "Update language to comply with Android's inclusive language guidance" am: ea575e7bc4 am: 0166574738 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382385

Change-Id: I2367b78e9b80b2ffe284cc18adf07e29925656a8
 2020-07-31 14:47:01 +00:00
Lais Andrade
4614b73141 Merge "Update language to comply with Android's inclusive language guidance" am: 5db2bcffdf am: f8712712af 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382536

Change-Id: I67f754501e5e9947bfd2891a156d46908dd8ab23
 2020-07-31 14:46:48 +00:00
Lais Andrade
40bdc0c86f Merge "Update language to comply with Android's inclusive language guidance" am: cb51202601 am: 6c6e238f23 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382537

Change-Id: I19ef5e99506ffbb2b7dcb79f72fae92161b77f8b
 2020-07-31 14:46:24 +00:00
Treehugger Robot
0166574738 Merge "Update language to comply with Android's inclusive language guidance" am: ea575e7bc4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382385

Change-Id: Id509ff54ef266066fa263458e1a76269a1f87685
 2020-07-31 14:34:55 +00:00
Lais Andrade
f8712712af Merge "Update language to comply with Android's inclusive language guidance" am: 5db2bcffdf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382536

Change-Id: I6ce21c63b8c635b37c8a5cb91315dfc092d9d27c
 2020-07-31 14:34:37 +00:00
Lais Andrade
6c6e238f23 Merge "Update language to comply with Android's inclusive language guidance" am: cb51202601 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382537

Change-Id: Ic28b910684687d3a404bd0e61b7c87846da8422a
 2020-07-31 14:33:57 +00:00
Treehugger Robot
ea575e7bc4 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-31 14:12:37 +00:00
Lais Andrade
5c2a4f55d9 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference


BUG=162536543

Change-Id: Iea1f8c3d2a253cad5a6a429389bbe3fc5fd4bc6b
 2020-07-31 14:11:38 +00:00
Lais Andrade
5db2bcffdf Merge "Update language to comply with Android's inclusive language guidance" 2020-07-31 14:07:06 +00:00
Lais Andrade
cb51202601 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-31 14:06:37 +00:00
Lais Andrade
a0670fa770 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: I4fbb7bba633c90c66c95117d17fde5a6c7374fde
 2020-07-31 13:25:44 +00:00
Lais Andrade
104b9949e5 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: Ief238c704c9d44b36d2252c59bd572f9a2318307
 2020-07-31 12:43:23 +00:00
Lais Andrade
d877fa3317 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: I8059d138ed476e89c7b796f0b1ad002692987a6f
 2020-07-31 12:39:40 +00:00
Lais Andrade
d3797976d8 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: I0ff4f00b9251789820023f25623f3bb9f8a437af
 2020-07-31 11:12:40 +00:00
Marcin Oczeretko
b211b96926 Merge "Update language to comply with Android's inclusive language guidance" am: 007cc402c1 am: 698a6c7c59 am: b4743356b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1376497

Change-Id: I7192a3edf8397218ede9a8a9016f2fd9c31af928
 2020-07-31 10:59:00 +00:00
Marcin Oczeretko
b4743356b4 Merge "Update language to comply with Android's inclusive language guidance" am: 007cc402c1 am: 698a6c7c59 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1376497

Change-Id: Ib4c675e5b38f4534ef7f62b3f25aa55372996b14
 2020-07-31 10:48:00 +00:00
Lais Andrade
e89e18b7a2 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: Ieda6c7d61cfe8ddba1b0d80c8b87d82a9895fa31
 2020-07-31 10:26:14 +00:00
Marcin Oczeretko
698a6c7c59 Merge "Update language to comply with Android's inclusive language guidance" am: 007cc402c1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1376497

Change-Id: I747191120332756b2e79a0f8be99220f6d361f1f
 2020-07-31 10:20:06 +00:00
Marcin Oczeretko
007cc402c1 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-31 09:58:04 +00:00
Peter Wang
c5a1961f76 [automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 8ba18c0508 am: 4b6112a42c -s ours am: 68aed47728 -s ours 
am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 ceba2adbbd is in history

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

Change-Id: Ic15254afce6f13f0553faf9ec98fc16fe9563c81
 2020-07-31 09:55:23 +00:00
Peter Wang
68aed47728 [automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 8ba18c0508 am: 4b6112a42c -s ours 
am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 ceba2adbbd is in history

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

Change-Id: I1e06f6cdb0e69e06cf94a543eec83478dabeda14
 2020-07-31 09:34:47 +00:00
Peter Wang
4b6112a42c Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 8ba18c0508 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749

Change-Id: I43a19b479d4c77bb19af31381e7d998527bc068a
 2020-07-31 09:04:43 +00:00
Peter Wang
8ba18c0508 Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" 2020-07-31 08:43:44 +00:00
Orion Hodson
c320cd0b89 Update art-team members in OWNERS files 
Test: build/make/tools/checkowners.py -c -v frameworks/base/core/java/android/os/OWNERS
Test: build/make/tools/checkowners.py -c -v frameworks/base/core/java/com/android/internal/os/OWNERS
Test: build/make/tools/checkowners.py -c -v frameworks/base/core/jni/OWNERS
Test: build/make/tools/checkowners.py -c -v frameworks/base/services/core/java/com/android/server/pm/dex/OWNERS
Test: build/make/tools/checkowners.py -c -v frameworks/base/tests/BootImageProfileTest/OWNERS
Change-Id: I958c12aacf2c0c18df7505674a49103f89e5a770
 2020-07-31 08:52:35 +01:00
yawanng
9b4958afb0 Notify IORap without including packages for secondary dex opt. 
The current secondary dex opt doesn't distinct between
opt performed and skipped, which causes unnecessary traces
purge for IORap.

Bug:161633001
Test: manually trigger bg-dexopt via 'adb shell cmd jobscheduler run -f
android 800' and check the log.

(cherry picked from commit ff800a363b)
Merged-In: Iae4fc0b6fc73707ada8895b38c3ae3f772ac2cd0
Change-Id: Iae4fc0b6fc73707ada8895b38c3ae3f772ac2cd0
 2020-07-31 06:50:16 +00:00
TreeHugger Robot
53db65ef90 [automerger skipped] Merge "Add missing isShellUser check" into oc-dev am: adc8f21ad1 am: ef301aba3e -s ours am: 09b011ffca -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 3a5cd5bbe3 is in history

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

Change-Id: Ib68711545fa595833110e41d33900d449232b2d0
 2020-07-31 06:10:05 +00:00
TreeHugger Robot
09b011ffca [automerger skipped] Merge "Add missing isShellUser check" into oc-dev am: adc8f21ad1 am: ef301aba3e -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 3a5cd5bbe3 is in history

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

Change-Id: Ic6d15d294e9a742e1c08fa1bc6d5c006a83d6994
 2020-07-31 05:51:30 +00:00
TreeHugger Robot
ef301aba3e Merge "Add missing isShellUser check" into oc-dev am: adc8f21ad1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12099340

Change-Id: Ie74d2561c45785dddc65efc46902a368c8a35736
 2020-07-31 05:32:49 +00:00
Treehugger Robot
4c7aeaf577 Merge "Update toString in ImsReasonInfo" am: e5e46c6dfd am: 7b7055970a am: 9237857679 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379678

Change-Id: I8ff00bb7e523506c4387ae26efc0d84e0f3fa15c
 2020-07-31 05:26:17 +00:00
TreeHugger Robot
adc8f21ad1 Merge "Add missing isShellUser check" into oc-dev 2020-07-31 05:24:19 +00:00
Treehugger Robot
9237857679 Merge "Update toString in ImsReasonInfo" am: e5e46c6dfd am: 7b7055970a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379678

Change-Id: I3b49beefd7f5bf4fe5753174a89010a96da0e5c6
 2020-07-31 05:10:58 +00:00
TreeHugger Robot
f1a3a1e736 Merge "Add missing isShellUser check" into oc-mr1-dev am: 0fb5377eb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12172257

Change-Id: I20b599818c78955b120a68a5823948db46e96014
 2020-07-31 05:03:22 +00:00
Treehugger Robot
7b7055970a Merge "Update toString in ImsReasonInfo" am: e5e46c6dfd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379678

Change-Id: I83170c8bae389db618bacbb0675f4eca8d62ae35
 2020-07-31 04:54:07 +00:00
TreeHugger Robot
0fb5377eb5 Merge "Add missing isShellUser check" into oc-mr1-dev 2020-07-31 04:45:08 +00:00
Treehugger Robot
e5e46c6dfd Merge "Update toString in ImsReasonInfo" 2020-07-31 04:38:03 +00:00
TreeHugger Robot
095a00f2ca Merge "Remove unused intent in NiNotification" into pi-dev 2020-07-31 01:56:09 +00:00
TreeHugger Robot
b321e8fa08 [automerger skipped] Merge "Remove unused intent in NiNotification" into oc-mr1-dev am: 03ea7aa96a -s ours 
am skip reason: Change-Id I5958a8fb442cf4506e1824243493f91aea34a7cc with SHA-1 ef5279d9f5 is in history

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

Change-Id: Ic64f99bb41101ca66a64d842ae1038e3752b5854
 2020-07-31 01:18:38 +00:00
Chalard Jean
29826a7a2f Merge "Move utils from network stack to libs." am: 21be4fabb5 am: bfadef51df am: 7a3454f47e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083

Change-Id: I56d148261c5fe94264ff0a68e87020329d06b857
 2020-07-31 01:12:13 +00:00
Nate Jiang
d48423561e Merge "[Wifi] Update language to comply with Android’s inclusive language guidance" am: 5be65d0810 am: 838b971cc4 am: e790db3aab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380674

Change-Id: Ia82462a731e19ef1c0e279d665f73c3e538468fa
 2020-07-31 01:11:50 +00:00
Chalard Jean
7a3454f47e Merge "Move utils from network stack to libs." am: 21be4fabb5 am: bfadef51df 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083

Change-Id: Ia163bc416e16ce56fc96855c1111a9905b712843
 2020-07-31 01:09:46 +00:00
Nate Jiang
e790db3aab Merge "[Wifi] Update language to comply with Android’s inclusive language guidance" am: 5be65d0810 am: 838b971cc4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380674

Change-Id: Iff94a433e6402214347c90651cd131e8ddd509ce
 2020-07-31 01:09:27 +00:00
TreeHugger Robot
03ea7aa96a Merge "Remove unused intent in NiNotification" into oc-mr1-dev 2020-07-31 01:04:56 +00:00
Chalard Jean
bfadef51df Merge "Move utils from network stack to libs." am: 21be4fabb5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083

Change-Id: I846dae9b7e36ddf6360bb946cc07beb8c44a34a5
 2020-07-31 00:53:12 +00:00
Nate Jiang
838b971cc4 Merge "[Wifi] Update language to comply with Android’s inclusive language guidance" am: 5be65d0810 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380674

Change-Id: I5e6edb60cafac72f5acf7d35151d1e348f28d693
 2020-07-31 00:52:23 +00:00
Chalard Jean
21be4fabb5 Merge "Move utils from network stack to libs." 2020-07-31 00:44:46 +00:00