Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
573,738 Commits 3 Branches 0 Tags
76e523aa00a631d50e8035cb012c1ceccccb82bc
Commit Graph

573738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sudheer Shanka
76e523aa00 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
 2020-07-31 03:06:21 -07:00
Nathalie Le Clair
6117d617e9 Merge "CEC Standby messages when going to sleep" 2020-07-29 08:07:46 +00:00
Paul Hu
154341cb4b Merge "[RFPM03] Check permission by uid." am: ce4d7d9493 am: a33a3a3a74 am: 608d002021 am: f6d7721f63 am: c6ec125732 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320375

Change-Id: Iee10248986fe1bda9fa97e6ae387e5ca4ec557c6
 2020-07-29 06:46:16 +00:00
Treehugger Robot
b5fb9a8b5f [automerger skipped] Merge "Add documentation for added 5G RAT capabilities" am: f03b626e85 am: 1f869bf777 am: b59284ac66 am: 96d7612c75 am: bd385b7983 -s ours 
am skip reason: Change-Id I0c916a89591ac88475d25c87f9c08eb0a3dd3147 with SHA-1 278352ee7e is in history

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

Change-Id: I5b816d09b2467bc77ebd7cc82d1bdea82a181089
 2020-07-29 06:45:25 +00:00
Paul Hu
c6ec125732 Merge "[RFPM03] Check permission by uid." am: ce4d7d9493 am: a33a3a3a74 am: 608d002021 am: f6d7721f63 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320375

Change-Id: I9d621e1342d2e8b7b4e7b0fb72303dad411abce0
 2020-07-29 06:28:47 +00:00
Treehugger Robot
bd385b7983 Merge "Add documentation for added 5G RAT capabilities" am: f03b626e85 am: 1f869bf777 am: b59284ac66 am: 96d7612c75 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375558

Change-Id: I3ea99e7554e343977eef1d33024aa4635ffedda4
 2020-07-29 06:28:35 +00:00
Paul Hu
f6d7721f63 Merge "[RFPM03] Check permission by uid." am: ce4d7d9493 am: a33a3a3a74 am: 608d002021 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320375

Change-Id: I35df9a8bb721f1303f351dbb115b09e911ea9a69
 2020-07-29 06:13:35 +00:00
Treehugger Robot
96d7612c75 Merge "Add documentation for added 5G RAT capabilities" am: f03b626e85 am: 1f869bf777 am: b59284ac66 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375558

Change-Id: Ide171735be9c753b196cb4e094361d3a4f1f31e6
 2020-07-29 06:13:24 +00:00
Paul Hu
608d002021 Merge "[RFPM03] Check permission by uid." am: ce4d7d9493 am: a33a3a3a74 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320375

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

Change-Id: I362e6d5bce64f60b2b1443e53a7a3566c5d747fc
 2020-07-29 05:53:20 +00:00
Treehugger Robot
b59284ac66 Merge "Add documentation for added 5G RAT capabilities" am: f03b626e85 am: 1f869bf777 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375558

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

Change-Id: I1ef0d35da436cc283ddc57daf5d8ec29f11db999
 2020-07-29 05:52:42 +00:00
Paul Hu
a33a3a3a74 Merge "[RFPM03] Check permission by uid." am: ce4d7d9493 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320375

Change-Id: I520b5d271d6d5214653ebaaeb5d6713c191b911d
 2020-07-29 05:47:15 +00:00
Paul Hu
ce4d7d9493 Merge "[RFPM03] Check permission by uid." 2020-07-29 05:41:32 +00:00
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
0251d25fdd Merge "Change the logic of getting ntp server" am: 7024d9205b am: bb601496d3 am: 19f12168d1 am: 4b188825f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1108155

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

Change-Id: I434a17c5f41aed0b7f40cc5d23f6c6c0999d3fa5
 2020-07-29 05:36:59 +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
Treehugger Robot
67059f49d4 Merge "Update language to comply with Android's inclusive language guidance" am: 2bf3785c3b am: 81aa66c980 am: ee48c9fb0b am: fe9e5f31bc am: e1da6458e0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375112

Change-Id: Ia40d121015725fa539c20f14930e9e95a3b0f84a
 2020-07-29 04:32:47 +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
Treehugger Robot
e1da6458e0 Merge "Update language to comply with Android's inclusive language guidance" am: 2bf3785c3b am: 81aa66c980 am: ee48c9fb0b am: fe9e5f31bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375112

Change-Id: I2afdb555ae44a365a8c45cdd93f1c47c617417a1
 2020-07-29 04:14:53 +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
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
3eece79af7 Merge "Update language to comply with Android's inclusive language guidance" am: 4b69c3c115 am: 9b956d4954 am: c46340e92c am: fc59f9b1e8 am: 1a0702e830 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374790

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

Change-Id: Idfbb1082e118c3ec56ca23449cc8fbf7e43dca40
 2020-07-29 03:43:22 +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
Hai Zhang
97a30acf59 Merge "Avoid calling into package manager while holding permission lock." 2020-07-29 03:30:49 +00:00
Jin Seok Park
7111b47eb1 Merge "Add function for adding EXIF to WebP files" 2020-07-29 03:29:42 +00:00
TreeHugger Robot
54816b3c94 Merge "Remove "Blacklist" nomenclature from USB services classes." 2020-07-29 03:29:36 +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
Jin Seok Park
6d70f272f9 Merge "Change Slog usage to Log" 2020-07-29 03:16:45 +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
61ea220266 Merge "Create SmsManager from a context" 2020-07-29 03:01:30 +00:00
Treehugger Robot
2bf3785c3b Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 03:00:50 +00:00
Junyu Lai
62b56d26ef Merge "Gracefully handle integer overflows." am: a308f79353 am: aeddf47458 am: a2a1e552cf am: 85c6bdbbeb am: 076ffecd31 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217

Change-Id: I7c04b66f75f64c214bd0c8d27bb5dbeda13094ce
 2020-07-29 02:58:33 +00:00
Hunter Knepshield
f37e9f46a2 Merge "Add documentation for added 5G RAT capabilities" 2020-07-29 02:54:28 +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
Junyu Lai
076ffecd31 Merge "Gracefully handle integer overflows." am: a308f79353 am: aeddf47458 am: a2a1e552cf am: 85c6bdbbeb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217

Change-Id: I86e762f63a2e18833dcebdae4921a24a18bbf01d
 2020-07-29 02:41:38 +00:00
Treehugger Robot
4b69c3c115 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 02:27:29 +00:00
TreeHugger Robot
5117501a1b Merge "Remove unused PIP Animation Code." 2020-07-29 02:27:21 +00:00
Varun Shah
9ac25b3189 Merge changes I65974f90,I98015097 
* changes:
  Clean up some of the Content Provider code.
  Reorganize some of the ContentProvider methods.
 2020-07-29 02:23:12 +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