Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
549,826 Commits 3 Branches 0 Tags
5fa537976529f0ae59e4eec5f3f6cb0902120dbb
Commit Graph

549826 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
5fa5379765 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c710e6f333 -s ours am: 25b065f746 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icfa4e60d3b28b4db49461d847990aea0edc1ee08
 2020-08-04 23:46:50 +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
3df6c69265 Merge "Rename blacklist to denylist" into rvc-dev-plus-aosp am: 47c5c8d1ef am: bafa9fb77e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12286466

Change-Id: I69c6713d5d5a11f68529ee71a52913ec5c1defea
 2020-08-04 22:22:32 +00:00
TreeHugger Robot
47e6cc5947 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e2a535da8a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7409853da49682bac29da4d7a1f5525cbcb99ab9
 2020-08-04 22:14:50 +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
TreeHugger Robot
e2a535da8a Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-04 22:01:51 +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
a9ae1f12ca [automerger skipped] Merge "Use -target 8 for android_uiautomator" am: 4aedb4cdad am: b26e082598 -s ours am: 1e1ae26206 -s ours am: 4c23c6b796 -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: I0c0bf45a32c4691b5bdcc8510d75304e6e29be21
 2020-08-04 21:18:51 +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
Bill Yi
18c29901f7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I941ab074bfc175558112212e52a798ec1c836546
 2020-08-04 20:53:56 +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
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
Liz Kammer
8fb23ab5e2 Merge "Remove create_stubs: false from droiddoc" am: a17375d057 am: 717f08295c am: 8b509e1e0c am: f3f6c4cabd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386551

Change-Id: I638a65fbb8644c03488995409061732b6d676f81
 2020-08-04 19:45:59 +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
Treehugger Robot
f834ebc0fb [automerger skipped] Merge "Update Visualizer implementation after changes in AudioEffect" am: 229720aee5 am: e1cb5a9a4a -s ours am: d5c197da6b -s ours am: 4844bf711d -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: I7b10835f2326a3cd6201ea9cbf0d823379607223
 2020-08-04 18:37:03 +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
Fabian Kozynski
5e6bdc42ee Merge "Guard against NPE" into rvc-qpr-dev am: cc514fd00d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12202983

Change-Id: Iaeddc252f3242f89b93f9a540261787df2a937e4
 2020-08-04 17:52:45 +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
Fabian Kozynski
cc514fd00d Merge "Guard against NPE" into rvc-qpr-dev 2020-08-04 17:33:47 +00:00
Treehugger Robot
229720aee5 Merge "Update Visualizer implementation after changes in AudioEffect" 2020-08-04 17:25:30 +00:00
Colin Cross
0150043553 Merge "Use -target 8 for android_uiautomator" into rvc-dev am: 48666a1abb am: a5498a5d70 am: 1ed9a7feb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12297232

Change-Id: I1131ba3020d37490abc1154c6d40035e0bd094b9
 2020-08-04 17:15:49 +00:00
Colin Cross
e855dffa81 Merge "Use -target 8 for android_uiautomator" into rvc-dev am: 48666a1abb am: 1689f9b01d am: 0a56479eb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12297232

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

Change-Id: I871e340a24f3c45df4c1dbacc9600ca44e846fe5
 2020-08-04 17:04:13 +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
1ed9a7feb1 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: Ic24765977f54fa9c4cb2974ea149c3f899fa4c3c
 2020-08-04 16:57:07 +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
Colin Cross
a5498a5d70 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: I241b4c142fb46364b85066948fa65ee6f9d5b25f
 2020-08-04 16:46:11 +00:00
TreeHugger Robot
d2034fcad1 Merge "Remove "Blacklist" nomenclature from USB services classes." into rvc-dev-plus-aosp am: 2764ffc44d am: 0fa6dd8470 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296481

Change-Id: Ife07d9608311ef5b8864e40d4441d9259aed06d8
 2020-08-04 16:39:20 +00:00
Colin Cross
48666a1abb Merge "Use -target 8 for android_uiautomator" into rvc-dev 2020-08-04 16:30:51 +00:00
TreeHugger Robot
0fa6dd8470 Merge "Remove "Blacklist" nomenclature from USB services classes." into rvc-dev-plus-aosp am: 2764ffc44d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296481

Change-Id: I54bd912d55e02d4c1affba9cdd3d6bc91d6583f5
 2020-08-04 16:16:01 +00:00
TreeHugger Robot
2764ffc44d Merge "Remove "Blacklist" nomenclature from USB services classes." into rvc-dev-plus-aosp 2020-08-04 16:03:21 +00:00
TreeHugger Robot
602c3fa036 Merge "Update Visualizer implementation after changes in AudioEffect" into rvc-dev-plus-aosp am: 3de6e81eb7 am: 72479c775f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12298175

Change-Id: I899d7cbf820eb9db87246b01cdcf3d4260e69b16
 2020-08-04 15:47:41 +00:00
Jonathan Nieder
3371e64939 Merge "Fix typo "thew" -> "threw" in AndroidTestRunner" am: 0b778939c7 am: 3f1247e91b am: 7d95615a4d am: 5f1edaf743 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/177320

Change-Id: I0f37cccc928a99de4ccad9e36210997662f2b2e5
 2020-08-04 15:47:11 +00:00
Josh Tsuji
2325a9361e Merge "Remember the stack position, including across configuration changes." into rvc-qpr-dev am: 9020ed08e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12254380

Change-Id: I904330889de1da23b2d44c0a948b51e6d454fd76
 2020-08-04 15:37:37 +00:00
TreeHugger Robot
72479c775f Merge "Update Visualizer implementation after changes in AudioEffect" into rvc-dev-plus-aosp am: 3de6e81eb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12298175

Change-Id: Ide91fb1a65b56e1f2260fdeb03cd62389fcded66
 2020-08-04 15:27:47 +00:00
Jonathan Nieder
5f1edaf743 Merge "Fix typo "thew" -> "threw" in AndroidTestRunner" am: 0b778939c7 am: 3f1247e91b am: 7d95615a4d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/177320

Change-Id: I1426f2320901cd1c98ecd288d97f9e9e267d66c1
 2020-08-04 15:27:11 +00:00
Josh Tsuji
9020ed08e1 Merge "Remember the stack position, including across configuration changes." into rvc-qpr-dev 2020-08-04 15:17:30 +00:00
TreeHugger Robot
3de6e81eb7 Merge "Update Visualizer implementation after changes in AudioEffect" into rvc-dev-plus-aosp 2020-08-04 15:14:18 +00:00
Jonathan Nieder
7d95615a4d Merge "Fix typo "thew" -> "threw" in AndroidTestRunner" am: 0b778939c7 am: 3f1247e91b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/177320

Change-Id: Ifb7370b8438fd2932b98a031b43af4f48e4869f4
 2020-08-04 15:06:45 +00:00
Jonathan Nieder
3f1247e91b Merge "Fix typo "thew" -> "threw" in AndroidTestRunner" am: 0b778939c7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/177320

Change-Id: I97d5b55d592acdb541334af19110c8830d707b51
 2020-08-04 14:55:35 +00:00
Orion Hodson
7c7fe31e82 Merge changes from topic "art-owners-update" am: 6066f5dae1 am: 74ad7baf85 am: 11f0a179d7 am: 03c7f1ce80 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382418

Change-Id: I0fbcc677227da24b476bbdac32bcfbb70c5c9329
 2020-08-04 14:54:23 +00:00
Jonathan Nieder
0b778939c7 Merge "Fix typo "thew" -> "threw" in AndroidTestRunner" 2020-08-04 14:35:43 +00:00