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

549698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
dc56cfe8ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: f5a667e787 -s ours am: a9e053ef50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41b59e7f1e10628e21e91e3bd5e12605fda0750a
 2020-08-03 22:25:21 +00:00
TreeHugger Robot
a9e053ef50 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: f5a667e787 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I261377a3247243608fa8939b6ec3f970fd551a5e
 2020-08-03 22:12:20 +00:00
Automerger Merge Worker
f10f5eb390 Merge "[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: e7b108a3b5 -s ours" into rvc-dev-plus-aosp am: 4f547ed394 -s ours am: da8928b705 -s ours 
am skip reason: Change-Id I971050a2665c177870ff257bd0f41343db702892 with SHA-1 9d7ff99a07 is in history

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

Change-Id: Ib217f70780c55828d2705f856af135db53e87710
 2020-08-03 22:03:43 +00:00
TreeHugger Robot
0fac0c27c8 [automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours am: 9aa778a081 -s ours am: b8582d6392 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 80a9cce44b is in history

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

Change-Id: I3d7f0e87b2dd4fb464b89fe27cd6120c371d4c05
 2020-08-03 22:03:14 +00:00
Automerger Merge Worker
2e5d5a4cf2 Merge "[automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours am: 917fa69690 -s ours am: 712db83bee -s ours" into rvc-qpr-dev-plus-aosp 2020-08-03 22:01:50 +00:00
TreeHugger Robot
ca0b62cb3d [automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours am: 917fa69690 -s ours am: ed19995508 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 bfdb7121ef is in history

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

Change-Id: I26e673fb1da7c2831b2b6debb85831d46b8161ab
 2020-08-03 22:01:42 +00:00
TreeHugger Robot
9e3b92393b [automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours am: 917fa69690 -s ours am: 712db83bee -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 bfdb7121ef is in history

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

Change-Id: Ie5e23614fd1809306a89b60acfca1aa9809370e0
 2020-08-03 22:01:29 +00:00
Eugene Susla
182b542937 Fix duplicate devices when multiple mediums scanning requested am: b8b53f3b39 am: 08ec7a316d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12295535

Change-Id: Id567e160f11132b79169f5b2d9791d74128eb35a
 2020-08-03 22:01:16 +00:00
Eugene Susla
c88bc262ac Fix duplicate devices when multiple mediums scanning requested am: b8b53f3b39 am: 57a4676876 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12295535

Change-Id: I4da7bf1b954da8d5aab87ff4ff474f9e12344103
 2020-08-03 22:00:58 +00:00
TreeHugger Robot
f5a667e787 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-03 21:54:17 +00:00
Automerger Merge Worker
da8928b705 Merge "[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: e7b108a3b5 -s ours" into rvc-dev-plus-aosp am: 4f547ed394 -s ours 
am skip reason: Change-Id I971050a2665c177870ff257bd0f41343db702892 with SHA-1 9d7ff99a07 is in history

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

Change-Id: I0f2f489b8b6cddfbf86838e0acf48857fe740a6f
 2020-08-03 21:50:57 +00:00
TreeHugger Robot
b8582d6392 [automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours am: 9aa778a081 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 80a9cce44b is in history

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

Change-Id: Iad8cc3b6fcd3c7c418b0b431321c8c444d7d479a
 2020-08-03 21:50:42 +00:00
TreeHugger Robot
712db83bee [automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours am: 917fa69690 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 bfdb7121ef is in history

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

Change-Id: I1a27c8523e1d6a1448952ec27b50409555813c2d
 2020-08-03 21:37:12 +00:00
TreeHugger Robot
ed19995508 [automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours am: 917fa69690 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 bfdb7121ef is in history

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

Change-Id: If0f493e4a30d796dd61c7840d1946d4346f4bf8a
 2020-08-03 21:37:07 +00:00
Eugene Susla
57a4676876 Fix duplicate devices when multiple mediums scanning requested am: b8b53f3b39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12295535

Change-Id: I70b16d03bfb77fe6953655b28fd3eaa4736df1be
 2020-08-03 21:36:44 +00:00
Eugene Susla
08ec7a316d Fix duplicate devices when multiple mediums scanning requested am: b8b53f3b39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12295535

Change-Id: Ib79a52ee96c9a386a5efd6446cf3594ea3d62b65
 2020-08-03 21:36:41 +00:00
Automerger Merge Worker
4f547ed394 Merge "[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: e7b108a3b5 -s ours" into rvc-dev-plus-aosp 2020-08-03 21:26:07 +00:00
TreeHugger Robot
9aa778a081 [automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 bfdb7121ef is in history

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

Change-Id: I751a8cc6a00a169b04e3a7f04f1b79ef4940cb8e
 2020-08-03 21:26:01 +00:00
Alex Light
45b3822a3c [automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: e7b108a3b5 -s ours 
am skip reason: Change-Id I971050a2665c177870ff257bd0f41343db702892 with SHA-1 9d7ff99a07 is in history

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

Change-Id: I267d10e1c9875e011c474ac1911a5a737cb3a86f
 2020-08-03 21:25:57 +00:00
TreeHugger Robot
917fa69690 [automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 bfdb7121ef is in history

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

Change-Id: I7a97fb3c18012567ce7fc94be042329b4f18e8f5
 2020-08-03 21:25:41 +00:00
TreeHugger Robot
3786221350 [automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 bfdb7121ef is in history

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

Change-Id: I0689df03f62b8ce269a436388ca1b0072800bdca
 2020-08-03 21:12:11 +00:00
Alex Light
e7b108a3b5 Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380906

Change-Id: Id2829bcdfb836db02db9842bb250e2eb628495aa
 2020-08-03 21:01:33 +00:00
TreeHugger Robot
ee7692c239 Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12171286

Change-Id: I45f0fa7f6d99d1bf7572aa53f084115a1cb920e5
 2020-08-03 20:59:18 +00:00
Alex Light
56f5e6595b Merge "Update language to comply with Android's inclusive language guidance" 2020-08-03 20:39:29 +00:00
TreeHugger Robot
8416431f37 Merge "Add missing isShellUser check" into qt-dev 2020-08-03 20:24:27 +00:00
Nate Jiang
8bfda849df Merge "DO NOT MERGE Revert "[NetworkSuggestion] Fix getEnterpriseConfig"" into rvc-qpr-dev am: 2bbbe141ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12294734

Change-Id: Ibfe7952be1208450f293acc8b49b5cd9a4ec1fff
 2020-08-03 20:09:21 +00:00
Nate Jiang
b1383c16f7 DO NOT MERGE Revert "[NetworkSuggestion] Fix getEnterpriseConfig" am: f570f1bdcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12294734

Change-Id: Id2f8900d4a08b3377f8d3fe232125dee34a7bf33
 2020-08-03 20:09:06 +00:00
Bill Yi
3850645278 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2a99dee33597c248107fb59e3ee8033f87562c92
 2020-08-03 20:03:11 +00:00
Nate Jiang
2bbbe141ef Merge "DO NOT MERGE Revert "[NetworkSuggestion] Fix getEnterpriseConfig"" into rvc-qpr-dev 2020-08-03 19:46:33 +00:00
Lais Andrade
39ed7a1b42 Merge "Change variable name fix from 'endingListener' to 'endListener'" am: af1750e973 am: d54498fb88 am: e6d76eb39d am: 277df8d8ff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386076

Change-Id: I02c5bad7e82ae906d32598ffaaad198181799311
 2020-08-03 19:18:13 +00:00
TreeHugger Robot
986681192e Merge "Don't clone the locale redundantly in Configuration.setTo()" into rvc-qpr-dev am: 786165bae0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12152573

Change-Id: Ia37b90f198ce8ca923ff5a1909d08225d2e30d35
 2020-08-03 19:07:19 +00:00
Lais Andrade
277df8d8ff Merge "Change variable name fix from 'endingListener' to 'endListener'" am: af1750e973 am: d54498fb88 am: e6d76eb39d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386076

Change-Id: I58bc63ba8ff945574235268904b079d189cad386
 2020-08-03 18:53:42 +00:00
TreeHugger Robot
786165bae0 Merge "Don't clone the locale redundantly in Configuration.setTo()" into rvc-qpr-dev 2020-08-03 18:42:10 +00:00
Eugene Susla
b8b53f3b39 Fix duplicate devices when multiple mediums scanning requested 
The dedupuing logic was already in place, but there was a race
due to managin the list of devices from different threads.

Test: using wear app ensure dup device reproduses without CL, and not with it
Fixes: 160870456
Change-Id: I1526199e8e4fb4b8f7d7f306e9e676359cdca516
 2020-08-03 18:40:04 +00:00
Lais Andrade
e6d76eb39d Merge "Change variable name fix from 'endingListener' to 'endListener'" am: af1750e973 am: d54498fb88 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386076

Change-Id: Id09f9faa6cb0615f5adfc4512079ff7e3c2d3768
 2020-08-03 18:39:47 +00:00
Lais Andrade
d54498fb88 Merge "Change variable name fix from 'endingListener' to 'endListener'" am: af1750e973 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386076

Change-Id: Ib4c3064ef0bdd28c2fb7ecc4c70215c19e6e618c
 2020-08-03 18:19:58 +00:00
Lais Andrade
af1750e973 Merge "Change variable name fix from 'endingListener' to 'endListener'" 2020-08-03 18:01:09 +00:00
Alex Light
7b942c1f31 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 162536543
Test: Treehugger
Change-Id: I971050a2665c177870ff257bd0f41343db702892
Merged-In: I971050a2665c177870ff257bd0f41343db702892
 2020-08-03 17:04:58 +00:00
Nate Jiang
f570f1bdcc DO NOT MERGE Revert "[NetworkSuggestion] Fix getEnterpriseConfig" 
This reverts commit a03bcee783.

Reason for revert: failing test because prebuild module
Bug: 162724237

Change-Id: I530123295c3366a6955076e9d9e031282c70c486
 2020-08-03 16:57:21 +00:00
TreeHugger Robot
ce6c8c7170 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: afab5784ea -s ours am: c7bacdca44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea8800f98723a5ffa0d2f7e7f863ecf07dc1b66f
 2020-08-03 16:42:36 +00:00
TreeHugger Robot
6fe73b4cf2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: afab5784ea -s ours am: 62d7c2461a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7cf2c239ec89cbe841c2a0c8ad6d2b86a0c8a178
 2020-08-03 16:42:15 +00:00
TreeHugger Robot
a4ccb87767 Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp am: 63ed9937f0 am: ab9c465a44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12282658

Change-Id: I293b49f1061181f07c9affad5922472ddfdf50ad
 2020-08-03 16:41:37 +00:00
TreeHugger Robot
c7bacdca44 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: afab5784ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iacbd4aea3355c2792c807c4c93d49b9ce5c40db8
 2020-08-03 16:29:40 +00:00
TreeHugger Robot
62d7c2461a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: afab5784ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie31333ab9cfa4fa2a2ae02e5f3e6382440bd5a72
 2020-08-03 16:28:17 +00:00
TreeHugger Robot
ab9c465a44 Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp am: 63ed9937f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12282658

Change-Id: I439c446bcd55b35ec41d7c4f76a53e39de5cdd4e
 2020-08-03 16:17:14 +00:00
TreeHugger Robot
afab5784ea Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-03 16:05:18 +00:00
TreeHugger Robot
63ed9937f0 Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp 2020-08-03 15:49:46 +00:00
Julia Reynolds
9ae8497ed1 Merge "Allow more concurrent notifications" into rvc-qpr-dev am: dbbf77f98a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12283549

Change-Id: Ib04dec96542cd7e002524fa5ea6edbb63bcc9133
 2020-08-03 15:03:52 +00:00
Julia Reynolds
dbbf77f98a Merge "Allow more concurrent notifications" into rvc-qpr-dev 2020-08-03 14:42:15 +00:00
Wei Sheng Shih
4aadb5e4dd Merge "Prevent sleep tokens from being created recursively." into rvc-qpr-dev am: 712847301b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12279995

Change-Id: Ide3412e4dccf53a0ecf240c4c366b6fd081637a7
 2020-08-03 14:27:39 +00:00