Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
516,831 Commits 3 Branches 0 Tags
861c8740b8a6b806a78a7b8a04a59d5da170b332
Commit Graph

516831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Elliott
ae567e56d8 Mark implicit PendingIntents as immutable am: 7f0fd285c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296406

Change-Id: I29e112de4bcc44c0d2dc5245e66c0b5bff04a216
 2020-08-05 20:25:43 +00:00
Steve Elliott
e35ad478dc Merge "Mark implicit PendingIntents as immutable" into rvc-dev 2020-08-05 20:08:37 +00:00
TreeHugger Robot
6a4d212454 Merge "Update language to comply with Android’s inclusive language guidance" into rvc-dev-plus-aosp am: ee4e5355bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12308260

Change-Id: If4fa13f2b471943f9cf9624ff9089ef6b6bdb628
 2020-08-05 20:01:11 +00:00
TreeHugger Robot
ee4e5355bf Merge "Update language to comply with Android’s inclusive language guidance" into rvc-dev-plus-aosp 2020-08-05 19:43:10 +00:00
Christian Wailes
c044cd9bb1 Merge "Rename blacklist to denylist" am: 0f2d849c39 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379680

Change-Id: I99177c0a228d6f07dd72b3c9625cfb80a4893f11
 2020-08-05 17:48:02 +00:00
Xin Li
da7d27b21e Merge QQ3A.200805.001 
Bug: 162879794
Merged-In: I6e0bdc8c02bab54f6278096b3a3acadd97c064c6
Change-Id: Idbcffbd09045575e92297fd6e0071a56a4e3cbae
 2020-08-05 17:40:02 +00:00
Christian Wailes
0f2d849c39 Merge "Rename blacklist to denylist" 2020-08-05 17:32:00 +00:00
Treehugger Robot
ff642c408c Merge "Parent: cc2d51fc (Merge "Update language to comply with Android's inclusive language guidance") Author: Paul McLean <pmclean@google.com> AuthorDate: 2020-07-28 15:07:26 +0000 Commit: Glenn Kasten <gkasten@android.com> CommitDate: 2020-08-04 00:06:51 +0000" am: 830c70ad25 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374724

Change-Id: I32f6e92956fc98e60691483f9a6905bbce25c74e
 2020-08-05 16:47:03 +00:00
Andrei Onea
6be88efde5 resolve merge conflicts of c94e810cab to rvc-dev-plus-aosp 
Change-Id: I47128585a8259dc51f25d679d1841578138f9a1d
 2020-08-05 17:42:55 +01:00
Treehugger Robot
830c70ad25 Merge "Parent: cc2d51fc (Merge "Update language to comply with Android's inclusive language guidance") Author: Paul McLean <pmclean@google.com> AuthorDate: 2020-07-28 15:07:26 +0000 Commit: Glenn Kasten <gkasten@android.com> CommitDate: 2020-08-04 00:06:51 +0000" 2020-08-05 16:23:51 +00:00
Wayne Lin
eaae63437f Extend SUPL network request timeout for consecutive SUPL request 
Extend timeout more than telephony retry timer to prevent CS release 2nd request before retry.

Bug: 159772456
Test: Consecutive emergency NI SUPL test, emergency NI SUPL test with/without SIM and SI SUPL test
Change-Id: Ib3e1f394adda6c2c2eacc38df941cc5e9fd8370d
 2020-08-05 13:19:51 +00:00
Andrei-Valentin Onea
c94e810cab Merge "Rename manual hidden api lists" am: f6d191c250 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382669

Change-Id: I62b261a0d977b97421293ac4f19221abc25fe6f4
 2020-08-05 13:06:27 +00:00
Lais Andrade
388881b89a Merge "Fix typo on View.verifyDrawable method javadoc" am: efd27a83f5 am: 8b8c8f1004 am: 655eb212ec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386078

Change-Id: I73d69dc87da46acf1677d8c53d69f8f798a09fbe
 2020-08-05 12:42:26 +00:00
Andrei-Valentin Onea
f6d191c250 Merge "Rename manual hidden api lists" 2020-08-05 12:42:18 +00:00
Lais Andrade
655eb212ec Merge "Fix typo on View.verifyDrawable method javadoc" am: efd27a83f5 am: 8b8c8f1004 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386078

Change-Id: Ie8720fc2f94420e5d01b03047aa1579c46f8f203
 2020-08-05 12:21:32 +00:00
Lais Andrade
8b8c8f1004 Merge "Fix typo on View.verifyDrawable method javadoc" am: efd27a83f5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386078

Change-Id: I8153c4050fc5de3a1d206d030ebaddb9ff748a7b
 2020-08-05 12:08:03 +00:00
Lais Andrade
efd27a83f5 Merge "Fix typo on View.verifyDrawable method javadoc" 2020-08-05 11:52:34 +00:00
Lais Andrade
50ef151f8b Fix typo on View.verifyDrawable method javadoc 
Fix: b/157335615
Test: N/A, only changing documentation
Change-Id: I30f869bdaac5fb6b87ea56a4416e619b46565113
 2020-08-05 08:20:08 +00:00
Mark Chien
26d2720b6f Merge "Allow wifi p2p to use legacy dedicated address" am: 5063505fab am: 08feabb384 am: 3743623e44 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398

Change-Id: I209007d8742ac5a331b2b19af164944f38ac36ca
 2020-08-05 06:54:40 +00:00
Mark Chien
3743623e44 Merge "Allow wifi p2p to use legacy dedicated address" am: 5063505fab am: 08feabb384 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398

Change-Id: Ica17499f82135bc96b87ca4071b603bb8cc23053
 2020-08-05 06:36:36 +00:00
Mark Chien
08feabb384 Merge "Allow wifi p2p to use legacy dedicated address" am: 5063505fab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398

Change-Id: I8977ef203c363d68c1c43ecd70f530a4924f01b9
 2020-08-05 06:22:38 +00:00
Mark Chien
5063505fab Merge "Allow wifi p2p to use legacy dedicated address" 2020-08-05 06:01:37 +00:00
James Wei
7ac1d04720 UsbAccessory: 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: I2650d273d7959e9cbe00518b364e57d0084abd92
 2020-08-05 03:24:46 +00:00
markchien
c09b057fb6 Allow wifi p2p to use legacy dedicated address 
Some exsting applications may expect wifi p2p use legacy
"192.168.49.1/24" address. Have a configuration for wifi p2p to
decide whether to use legacy dedicated address or random address.

Bug: 161520826
Test: atest TetheringTests
Change-Id: If79973416a6780ee19ee785c65772b1a2dc1fbf7
 2020-08-05 11:03:46 +08:00
Paul McLean
79de4d7ec9 Parent: cc2d51fc (Merge "Update language to comply with Android's inclusive language guidance") 
Author:     Paul McLean <pmclean@google.com>
AuthorDate: 2020-07-28 15:07:26 +0000
Commit:     Glenn Kasten <gkasten@android.com>
CommitDate: 2020-08-04 00:06:51 +0000

Update language to comply with Android's inclusive language guidance

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

Bug: 161896447
Bug: 162315796
Test: Build, flash...
Change-Id: I4b3affce57ba61ad9697e91f2a5f63556ee1cd62
Merged-in: I4b3affce57ba61ad9697e91f2a5f63556ee1cd62
 2020-08-04 23:32:44 +00:00
Bill Yi
25b065f746 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c710e6f333 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a3bf4972a6093bad42bc36d949dbe2d33147d9c
 2020-08-04 23:28:58 +00:00
Christian Wailes
bafa9fb77e Merge "Rename blacklist to denylist" into rvc-dev-plus-aosp am: 47c5c8d1ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12286466

Change-Id: I32bf6f846df71614413cd0846547bca2b070eda1
 2020-08-04 22:05:17 +00:00
repo sync -c -j8
8d2ad2176f Rename blacklist to denylist 
Test: no new test
Change-Id: If8bb7c923f1ce8d8ce8c3142bf1b674982a96573
Merged-In: If8bb7c923f1ce8d8ce8c3142bf1b674982a96573
 2020-08-04 21:42:25 +00:00
Christian Wailes
47c5c8d1ef Merge "Rename blacklist to denylist" into rvc-dev-plus-aosp 2020-08-04 21:41:59 +00:00
Treehugger Robot
4c23c6b796 [automerger skipped] Merge "Use -target 8 for android_uiautomator" am: 4aedb4cdad am: b26e082598 -s ours am: 1e1ae26206 -s ours 
am skip reason: Change-Id I6871ab5436232ad3bffff6bd26adf2de6b3c06ff with SHA-1 51387a027d is in history

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

Change-Id: I0c987982eaca826b88b3a949fd7ec0b875372666
 2020-08-04 21:01:49 +00:00
Chavi Weingarten
e6c662098d Revert "Reparent bounds layer if surface was replaced." 
This was intended to fix a reparent issue when preserving
surfaces before the app was closed. That is no longer happening
so this change is no longer needed.

The reason this causes the flicker is it waits to reparent until
next frame. However, the frame can be submitted before WM gets a
chance to show the new Surface since that request is sent to WM.

Therefore, the SurfaceView can end up getting reparented to the
new SurfaceControl before the new SurfaceControl is visible,
causing it to be hidden for a few frames.

This reverts commit c1dcac9568.

Reason for revert: b/162377855

Fixes: 162377855
Test: Split screen with SurfaceView doesn't flicker
Change-Id: Ic7a209b7aa66e278b99a526d8427f140b31de0f6
 2020-08-04 20:36:49 +00:00
Steve Elliott
599c3e4b75 Mark implicit PendingIntents as immutable 
Bug: 156020795
Test: manual, atest
Change-Id: I72206c7a52b067b77d6542d170a6483713dfeee7
(cherry picked from commit 84e08280d3)
 2020-08-04 20:22:46 +00:00
Steve Elliott
7f0fd285c6 Mark implicit PendingIntents as immutable 
Bug: 156020795
Test: manual, atest
Change-Id: I72206c7a52b067b77d6542d170a6483713dfeee7
(cherry picked from commit 84e08280d3)
 2020-08-04 20:21:51 +00:00
Bill Yi
c710e6f333 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I42d66695970ff56f25e2074b30a1bcdfe3eece9f
 2020-08-04 20:17:08 +00:00
Treehugger Robot
1e1ae26206 [automerger skipped] Merge "Use -target 8 for android_uiautomator" am: 4aedb4cdad am: b26e082598 -s ours 
am skip reason: Change-Id I6871ab5436232ad3bffff6bd26adf2de6b3c06ff with SHA-1 51387a027d is in history

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

Change-Id: I959b993b15f431e0a71bb2af5970b0daf5f45f4a
 2020-08-04 20:17:00 +00:00
Julia Tuttle
4d21e25183 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: still builds! let's see what presubmit says.
Change-Id: Ia0aac0b80511076f77a64a9eee6eff9376ed906f
(cherry picked from commit c9405cf22b)
 2020-08-04 20:03:44 +00:00
Treehugger Robot
b26e082598 Merge "Use -target 8 for android_uiautomator" am: 4aedb4cdad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388897

Change-Id: I6bd40adb63904148e057823e0e6acf34cab8ae72
 2020-08-04 19:57:33 +00:00
Treehugger Robot
4aedb4cdad Merge "Use -target 8 for android_uiautomator" 2020-08-04 19:42:02 +00:00
Liz Kammer
f3f6c4cabd Merge "Remove create_stubs: false from droiddoc" am: a17375d057 am: 717f08295c am: 8b509e1e0c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386551

Change-Id: I117da08146d8c9072b6657733decb8385a31eace
 2020-08-04 19:32:25 +00:00
Liz Kammer
8b509e1e0c Merge "Remove create_stubs: false from droiddoc" am: a17375d057 am: 717f08295c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386551

Change-Id: I83603132cf428137542310d7841fa919aea1983d
 2020-08-04 19:14:46 +00:00
Liz Kammer
717f08295c Merge "Remove create_stubs: false from droiddoc" am: a17375d057 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386551

Change-Id: If0e28fbf52653dd310fbea9dfea564afab49eee3
 2020-08-04 18:58:22 +00:00
Liz Kammer
a17375d057 Merge "Remove create_stubs: false from droiddoc" 2020-08-04 18:35:43 +00:00
Treehugger Robot
4844bf711d [automerger skipped] Merge "Update Visualizer implementation after changes in AudioEffect" am: 229720aee5 am: e1cb5a9a4a -s ours am: d5c197da6b -s ours 
am skip reason: Change-Id I90ac6e4fe0a1229758a98a63a3b7810de60469be with SHA-1 88441891a5 is in history

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

Change-Id: I292751d530b7a1301f7f596c6ff55cbc2237b77e
 2020-08-04 18:20:20 +00:00
Treehugger Robot
d5c197da6b [automerger skipped] Merge "Update Visualizer implementation after changes in AudioEffect" am: 229720aee5 am: e1cb5a9a4a -s ours 
am skip reason: Change-Id I90ac6e4fe0a1229758a98a63a3b7810de60469be with SHA-1 88441891a5 is in history

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

Change-Id: Ie96391c26cdd4dd345f6c04294ae952ce5019539
 2020-08-04 18:01:08 +00:00
Treehugger Robot
e1cb5a9a4a Merge "Update Visualizer implementation after changes in AudioEffect" am: 229720aee5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386887

Change-Id: I43f1869f494448f09c1ae50ae1cc621eb56039b6
 2020-08-04 17:45:32 +00:00
Colin Cross
43ffc371f6 Use -target 8 for android_uiautomator 
android_uiautomator is distributed as part of the SDK and should use
-target 8 for compatibility with old JDKs.

Bug: 150153790
Bug: 162522383
Test: javap -v -cp out/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/classes.jar com.android.uiautomator.core.Configurator | grep "major version"
Change-Id: I6871ab5436232ad3bffff6bd26adf2de6b3c06ff
Merged-In: I6871ab5436232ad3bffff6bd26adf2de6b3c06ff
(cherry picked from commit 51387a027d)
 2020-08-04 10:38:39 -07:00
Treehugger Robot
229720aee5 Merge "Update Visualizer implementation after changes in AudioEffect" 2020-08-04 17:25:30 +00:00
Colin Cross
0a56479eb7 Merge "Use -target 8 for android_uiautomator" into rvc-dev am: 48666a1abb am: 1689f9b01d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12297232

Change-Id: I5e77ad2c9b4962c6ef29351dc72844ebe2babec8
 2020-08-04 16:57:08 +00:00
Colin Cross
1b7afbefc8 Merge "Use -target 8 for android_uiautomator" into rvc-dev am: 48666a1abb am: a5498a5d70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12297232

Change-Id: I569c927cb5ae9ddca418f56979459f4667fbb933
 2020-08-04 16:55:43 +00:00
Colin Cross
1689f9b01d Merge "Use -target 8 for android_uiautomator" into rvc-dev am: 48666a1abb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12297232

Change-Id: I336f04d7d13ab2687d148138c67ca210243e70df
 2020-08-04 16:46:19 +00:00