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
1f869bf777 Merge "Add documentation for added 5G RAT capabilities" am: f03b626e85 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375558

Change-Id: I3e19bebcc0b12560c93b00afe202794b357e695a
 2020-07-29 05:38:14 +00:00
Dan Zhang
4b188825f8 Merge "Change the logic of getting ntp server" am: 7024d9205b am: bb601496d3 am: 19f12168d1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1108155

Change-Id: Id2cd86988e17ad916907122d4d71adb673191029
 2020-07-29 05:21:31 +00:00
Mark Chien
631cb3dcc8 Merge "Always stop dhcp server even it is obsolete" am: 0ae446b50d am: d2ca7e8b1e am: 136c4f98b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370217

Change-Id: Id45ad3c4bcc90fc3b8355428f8b5d131b220470e
 2020-07-29 05:21:00 +00:00
Treehugger Robot
f03b626e85 Merge "Add documentation for added 5G RAT capabilities" 2020-07-29 05:17:40 +00:00
Dan Zhang
19f12168d1 Merge "Change the logic of getting ntp server" am: 7024d9205b am: bb601496d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1108155

Change-Id: I77a3f9c3a1143934345c38bf982ae4507e06c238
 2020-07-29 04:56:48 +00:00
Mark Chien
136c4f98b4 Merge "Always stop dhcp server even it is obsolete" am: 0ae446b50d am: d2ca7e8b1e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370217

Change-Id: Ibb1c96fce2435fec3f678d89531ed10a6ddc784f
 2020-07-29 04:56:10 +00:00
Dan Zhang
bb601496d3 Merge "Change the logic of getting ntp server" am: 7024d9205b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1108155

Change-Id: Icc4bc5711db083a14cb15443ebc6fbf046042c58
 2020-07-29 04:42:37 +00:00
Mark Chien
d2ca7e8b1e Merge "Always stop dhcp server even it is obsolete" am: 0ae446b50d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370217

Change-Id: I6eb68ffd14d3491784d643e0059ca6591de7d8a6
 2020-07-29 04:42:10 +00:00
Dan Zhang
7024d9205b Merge "Change the logic of getting ntp server" 2020-07-29 04:29:11 +00:00
Mark Chien
0ae446b50d Merge "Always stop dhcp server even it is obsolete" 2020-07-29 04:27:30 +00:00
Peter Wang
f45b3622fc Add documentation for added 5G RAT capabilities 
Bug: 161483894
Fix: 161483894
Test: N/A
Change-Id: I0c916a89591ac88475d25c87f9c08eb0a3dd3147
Merged-In: I0c916a89591ac88475d25c87f9c08eb0a3dd3147
 2020-07-28 21:09:29 -07:00
android-build-team Robot
9434252a9b Merge cherrypicks of [12257241, 12257478, 12257643, 12257707, 12257297, 12257742, 12257668, 12257743, 12257513, 12257278, 12257279, 12257514, 12257644, 12257669, 12257670, 12257671] into rvc-release 
Change-Id: I3669363c1b98ac139f341e0bd898cbbff15cb061
 2020-07-29 04:05:49 +00:00
Chiachang Wang
c79215d9eb Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code
for reference.

Test: m ; atest TetheringTests
Bug: 161896447
Change-Id: Idc58697c72fb00896bee00185fefc50c1a24dd35
 2020-07-29 12:05:04 +08:00
Lorenzo Colitti
e95a490dd1 Set the NetworkInfo subtype to 0. 
For non-telephony networks, this was always set to 0 before R.
In R, it is currently set to the same value as the network type.
This is incorrect because the two have different namespaces.
or example, currently, any network of type WIFI (==1) will have
a subtype of NETWORK_TYPE_GPRS (==1). Similarly, all ETHERNET
networks will have subtype NETWORK_TYPE_1XRTT, all VPN networks
will have a subtype of NETWORK_TYPE_TD_SCDMA, etd.

Bug: 161653721
Test: builds, boots
Change-Id: I07e111c1762e0021c931cefc27f193f78578748b
(cherry picked from commit a40ff70cad)
 2020-07-29 04:04:42 +00:00
Alice Kuo
9922d8cc9d Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

#inclusivefixit

Bug: 161896447
Test: NA (Comment only)

Change-Id: Id4f72f98d5a5def26d42d112aeb1b67217d38af0
 2020-07-29 04:00:34 +00:00
Treehugger Robot
fe9e5f31bc Merge "Update language to comply with Android's inclusive language guidance" am: 2bf3785c3b am: 81aa66c980 am: ee48c9fb0b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375112

Change-Id: I8a7224c620930538500eb0a22f896e76a0d1cd0c
 2020-07-29 03:59:54 +00:00
Treehugger Robot
ee48c9fb0b Merge "Update language to comply with Android's inclusive language guidance" am: 2bf3785c3b am: 81aa66c980 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375112

Change-Id: I8279d46549d0df8c403c7fe9f5ba91f4eb11a9c9
 2020-07-29 03:34:27 +00:00
Treehugger Robot
fc59f9b1e8 Merge "Update language to comply with Android's inclusive language guidance" am: 4b69c3c115 am: 9b956d4954 am: c46340e92c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374790

Change-Id: I41dec2d71360d6e464f82d92f1f637f449738d16
 2020-07-29 03:27:31 +00:00
Treehugger Robot
81aa66c980 Merge "Update language to comply with Android's inclusive language guidance" am: 2bf3785c3b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375112

Change-Id: I926ed82a4d21e73b91b590a6fb2e556753c10ef2
 2020-07-29 03:17:19 +00:00
Treehugger Robot
c46340e92c Merge "Update language to comply with Android's inclusive language guidance" am: 4b69c3c115 am: 9b956d4954 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374790

Change-Id: I03bb221d860086bb4f621e9e6ff069fe15210f07
 2020-07-29 03:06:59 +00:00
Treehugger Robot
2bf3785c3b Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 03:00:50 +00:00
Treehugger Robot
9b956d4954 Merge "Update language to comply with Android's inclusive language guidance" am: 4b69c3c115 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374790

Change-Id: Iaff646076372f471db19628a7c3be2be8378d8b3
 2020-07-29 02:49:24 +00:00
Treehugger Robot
4b69c3c115 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 02:27:29 +00:00
Junyu Lai
85c6bdbbeb Merge "Gracefully handle integer overflows." am: a308f79353 am: aeddf47458 am: a2a1e552cf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217

Change-Id: I9cde0d9e70b389b91bde9b3384f82887259c9c74
 2020-07-29 02:14:58 +00:00
markchien
2fa3ea6457 Always stop dhcp server even it is obsolete 
If dhcp server is obsolete, explicitly stop it to shut down its thread.

Bug: 161418295
Test: atest CtsTetheringTest
Change-Id: Ic5b876bd23711ec8d832879a7baee0495246b218
 2020-07-29 09:55:29 +08:00
Junyu Lai
a2a1e552cf Merge "Gracefully handle integer overflows." am: a308f79353 am: aeddf47458 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217

Change-Id: I0bba17d0367ebf4e1c868a8cc7471366bc7a4408
 2020-07-29 01:55:23 +00:00
Junyu Lai
aeddf47458 Merge "Gracefully handle integer overflows." am: a308f79353 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217

Change-Id: I779298886cfaef330b433fea6009860682df35bd
 2020-07-29 01:37:48 +00:00
Junyu Lai
a308f79353 Merge "Gracefully handle integer overflows." 2020-07-29 01:19:07 +00:00
Treehugger Robot
2d3240aac6 Merge "Update comment to use inclusive language" am: 3b7913607b am: 03e5841ec1 am: cb45db0650 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373954

Change-Id: I4c3d362dd4875f39e5440eec5c7a049c2c8627ac
 2020-07-29 00:49:45 +00:00
Treehugger Robot
cb45db0650 Merge "Update comment to use inclusive language" am: 3b7913607b am: 03e5841ec1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373954

Change-Id: Ia7b2e14787dd716af3150fa24a8accff05a8ebc8
 2020-07-29 00:27:06 +00:00
Treehugger Robot
03e5841ec1 Merge "Update comment to use inclusive language" am: 3b7913607b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373954

Change-Id: Iefc994e9c5c079fbec7aec21396fec3b65717e84
 2020-07-29 00:05:20 +00:00
Lucas Dupin
6dbda27f98 Require a more specific intent 
Bug: 147606347
Fixes: 161150380
Test: run poc, device didn't reboot
Change-Id: I8f721ca659d58271880a7adbf386b270b331e55b
Merged-In: I8f721ca659d58271880a7adbf386b270b331e55b
(cherry picked from commit a9afc32ddc)
(cherry picked from commit d16e86f466)
 2020-07-28 23:49:31 +00:00
Treehugger Robot
3b7913607b Merge "Update comment to use inclusive language" 2020-07-28 23:46:03 +00:00
Blake Kragten
c09d09906a Remove Enhanced Connectivity Dev Option 
Applying to d1-dev as this change will be propagated to qpr branch.

Remove Developer Option Enhanced Connectivity. Remove controller and
layout variables/tests.

Bug: 162231796
Test: On Device Custom Build. Testing BSM trigger. Developer Option does
not appear anymore.

Change-Id: I58938faa299e30d4f357ed4e094b8548964b9dcc
 2020-07-28 22:44:27 +00:00
Curtis Belmonte
e1282eb847 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: I7f7dae2bfbcf0fe98f1a716647cb17008495f3cf
 2020-07-28 21:39:18 +00:00
Pirama Arumuga Nainar
88db3035b5 Use blocklist sub-property in sanitize 
Update language to comply with Android’s inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Bug: 162245450

Test: build topic
Change-Id: I952732a034a660a6a6577195d33b2fc2f4f4c78c
 2020-07-28 14:38:20 -07:00
Curtis Belmonte
6612511cc4 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: Icf24f492929b1b69d9eb78059a498d77273bd7a8
 2020-07-28 21:35:01 +00:00
Hall Liu
9c660801c7 Merge "Run CtsTelecomTestCases in presubmit" am: 1b2995ca3f am: 0022d0dc37 am: a125ea21f2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1334115

Change-Id: I1a6a4ebb154e708acc677da749a56f98746b3dcc
 2020-07-28 21:27:33 +00:00
Tom Cherry
9f97e7c07c Merge "Delete more unused includes in statsd" into rvc-dev-plus-aosp am: 521bba25c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12243153

Change-Id: Ib7d5d24584518b886808c79419c072f2ba3b13d7
 2020-07-28 21:26:42 +00:00
Shuo Qian
71818ce490 Change the range checking for ssrsrq 
Test: Telephony tests
Bug: 159761054
Change-Id: I383f3b5c7b4e89fa7e9cd3be6e77c3d99552b99c
 2020-07-28 21:25:20 +00:00
Hall Liu
a125ea21f2 Merge "Run CtsTelecomTestCases in presubmit" am: 1b2995ca3f am: 0022d0dc37 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1334115

Change-Id: I3c242b6e16e6176f398f14f4aca58a7be0b42eae
 2020-07-28 21:16:18 +00:00
Tom Cherry
ed93b3f904 Delete more unused includes in statsd 
Test: build
Merged-In: Ie639f57f86c2573cd5e06a1fa9397487f4b3f235
Change-Id: Ie639f57f86c2573cd5e06a1fa9397487f4b3f235
 2020-07-28 21:12:29 +00:00
Tom Cherry
521bba25c9 Merge "Delete more unused includes in statsd" into rvc-dev-plus-aosp 2020-07-28 21:12:04 +00:00
Hall Liu
0022d0dc37 Merge "Run CtsTelecomTestCases in presubmit" am: 1b2995ca3f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1334115

Change-Id: Ifb4754efe68239451c8b476a94d1625642217e58
 2020-07-28 21:01:15 +00:00
Hall Liu
1b2995ca3f Merge "Run CtsTelecomTestCases in presubmit" 2020-07-28 20:47:36 +00:00
Curtis Belmonte
d2fe864466 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: I02fd71bce7deb031a3699ce79121ea4c424fac61
 2020-07-28 20:47:00 +00:00
Treehugger Robot
2020cf0234 Merge "Update language to comply with Android's inclusive language guidance" am: e211918c69 am: ff0a6eab18 am: 9ab827cc25 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373837

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

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

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

Change-Id: Ic52b887978dca4791d2d80ace3473a26141f0cc3
 2020-07-28 20:34:42 +00:00