Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
468,813 Commits 3 Branches 0 Tags
abe2fed8b04c625ea762165ca7e8a0e37c91fefa
Commit Graph

468813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
aae4da8fd3 Merge "Remove "ro." prefix from sdk extension props" am: 57c17a8136 
Change-Id: I0dda2c3463257bfecee1fd52e607ffbad38c6646
 2020-02-08 11:43:59 +00:00
Anton Hansson
57c17a8136 Merge "Remove "ro." prefix from sdk extension props" 2020-02-08 11:26:57 +00:00
Sudheer Shanka
f4c2abc3f7 Re-enable testHandleIdleMaintenance_deleteStaleSessions. 
Bug: 149081953
Test: atest ./services/tests/mockingservicestests/src/com/android/server/blob/BlobStoreManagerServiceTest.java
Change-Id: Icc5e28fd1fd021e075255ed1c19c8c0684e28e9d
 2020-02-07 22:15:38 -08:00
Ben Lin
ec10bfa32d Merge "Refactor TaskPositioner resizing logic into a shareable class." 2020-02-08 05:51:03 +00:00
Automerger Merge Worker
4478d19f5f [automerger skipped] Merge "[Settings] To avoid use APIs in IccCard directly, moving APIs into TelephonyManager." am: e6d7525805 am: 3f04483102 am: c8f4ac6679 -s ours 
am skip reason: Change-Id I1a3c3b15063ea00d0ca59bd5395f2bca8cdfe391 with SHA-1 16a1821f9c is in history

Change-Id: I4ad71e96085f8413368e551de081f5fdb931f6be
 2020-02-08 05:28:40 +00:00
Automerger Merge Worker
93344fe4bd [automerger skipped] Merge "[Settings] Expose @hide #setDataAllowedDuringVoiceCall and #isDataAllowedInVoiceCall as @SystemApi" am: 3ba74ca897 am: d1c0f8faac am: ad0dc8e479 -s ours 
am skip reason: Change-Id Ib0e6bfa01db9cfabae7ebcce4548dc885e589144 with SHA-1 66f08c4947 is in history

Change-Id: I2ebc8632a9365e0a4fbed4fbb2bc7b26e14f63b5
 2020-02-08 05:28:00 +00:00
Muhammad Qureshi
555400f13b Add statsd_java_aidl to framework-statsd 
Bug: 146578171
Test: m
Change-Id: I9ed1e4ea357e6825dc587f9311ac80c838e5a0b7
 2020-02-07 21:14:03 -08:00
Muhammad Qureshi
ab20e94222 Remove @hide usages from statsd apex 
- Slog -> Log
- Inline Context.STATS_COMPANION_SERVICE
- Inline Context.STATS_MANAGER_SERVICE
- Inline Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND. This is temporary.
Will use the approach in ag/10055770 in a follow-up CL.

Bug: 149128236
Test: m
Change-Id: I76f4b139d375f67c6d69b8494a9e843f773eeb09
 2020-02-07 21:14:03 -08:00
Automerger Merge Worker
c8f4ac6679 Merge "[Settings] To avoid use APIs in IccCard directly, moving APIs into TelephonyManager." am: e6d7525805 am: 3f04483102 
Change-Id: Iab3af3207512e6445f225f8622a1230b197c4814
 2020-02-08 05:07:12 +00:00
Automerger Merge Worker
ad0dc8e479 Merge "[Settings] Expose @hide #setDataAllowedDuringVoiceCall and #isDataAllowedInVoiceCall as @SystemApi" am: 3ba74ca897 am: d1c0f8faac 
Change-Id: Ieebfcebc518768df31d3f5e23840b2279aa007d8
 2020-02-08 05:06:42 +00:00
Howard Ro
763cb8f95c Merge "Add support for multi train logging" 2020-02-08 04:54:37 +00:00
Automerger Merge Worker
3f04483102 Merge "[Settings] To avoid use APIs in IccCard directly, moving APIs into TelephonyManager." am: e6d7525805 
Change-Id: I1187a4e4370db8e4b24aba7c012f765c3e6e9efb
 2020-02-08 04:47:00 +00:00
Automerger Merge Worker
d1c0f8faac Merge "[Settings] Expose @hide #setDataAllowedDuringVoiceCall and #isDataAllowedInVoiceCall as @SystemApi" am: 3ba74ca897 
Change-Id: Ib0a5e2711b1d16538c062647e87ebfa86550897e
 2020-02-08 04:45:25 +00:00
Zoey Chen
e6d7525805 Merge "[Settings] To avoid use APIs in IccCard directly, moving APIs into TelephonyManager." 2020-02-08 04:25:32 +00:00
Zoey Chen
3ba74ca897 Merge "[Settings] Expose @hide #setDataAllowedDuringVoiceCall and #isDataAllowedInVoiceCall as @SystemApi" 2020-02-08 04:25:22 +00:00
Automerger Merge Worker
a5283c26a4 [automerger skipped] DO NOT MERGE - Added system user packages blacklist / whitelist to dump() am: 7082688f29 am: ad730d7573 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ibb249d7808dfc4312fc6e1e8d4b157d6bfab23d9
 2020-02-08 04:00:42 +00:00
Automerger Merge Worker
6eef13b0d0 [automerger skipped] DO NOT MERGE - Add flag to turn on/off the headless user specific blacklist/whitelist am: 81ce02f510 am: 26905ee0dd -s ours 
am skip reason: subject contains skip directive

Change-Id: I9f696338d578b17cf396fe639cd8894067d6bc7b
 2020-02-08 04:00:29 +00:00
Automerger Merge Worker
696c681109 [automerger skipped] DO NOT MERGE - Enable blacklist for headless system user am: f8c0b31524 am: 55c7b67de9 -s ours 
am skip reason: subject contains skip directive

Change-Id: I1a3841abb1b56312d732ec9a2669bf6ad4ee291c
 2020-02-08 04:00:18 +00:00
Automerger Merge Worker
ad730d7573 DO NOT MERGE - Added system user packages blacklist / whitelist to dump() am: 7082688f29 
Change-Id: Ibeff793744bab49a8363dea5e891acd58795a757
 2020-02-08 03:48:51 +00:00
Automerger Merge Worker
26905ee0dd DO NOT MERGE - Add flag to turn on/off the headless user specific blacklist/whitelist am: 81ce02f510 
Change-Id: If9928abe6f7af3f9ef2d4ba4375983a067357b76
 2020-02-08 03:48:36 +00:00
Automerger Merge Worker
55c7b67de9 DO NOT MERGE - Enable blacklist for headless system user am: f8c0b31524 
Change-Id: I9da9ffcb0f8498b3a01295c23e3c78d4f85dbb20
 2020-02-08 03:48:16 +00:00
TreeHugger Robot
0dff4461ac Merge changes from topic "statsd_libbinder_ndk" 
* changes:
  Use StatsDimensionsValueParcel within statsd apex
  Use cpp aidl_interface within statsd
 2020-02-08 03:33:25 +00:00
Automerger Merge Worker
c9a7cd6bba Merge "API review cleanups." am: 6c812cc994 am: 70c3352ca8 am: ebda19f6d3 
Change-Id: I63289b6ddd887ed0dbd4c7ed88879721172562a4
 2020-02-08 02:44:24 +00:00
Christopher Tate
e950296c21 Send LOCKED_BOOT_COMPLETED on same queue as BOOT_COMPLETED 
Make sure that the LOCKED_BOOT_COMPLETED broadcast is dispatched via the
same delivery queue as BOOT_COMPLETED.  Currently, it's possible for an
app to receive the two broadcasts in reverse order, which violates the
start sequence contract.

Bug: 149030767
Test: boot & observe LOCKED_BOOT_COMPLETED / BOOT_COMPLETED history
Change-Id: Ib44d53a0c97a24ec648e1d9c9057464f6cb331d8
 2020-02-07 18:34:27 -08:00
Automerger Merge Worker
ebda19f6d3 Merge "API review cleanups." am: 6c812cc994 am: 70c3352ca8 
Change-Id: I7ffef82ee88947e5025a719103f218eec003a934
 2020-02-08 02:27:59 +00:00
Automerger Merge Worker
286b11c0a9 [automerger skipped] Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: 71ab50ae23 am: 75a312ca39 am: 5286e87ab0 -s ours 
am skip reason: subject contains skip directive

Change-Id: I9361e90c9043f781e71158518cfe5b27362034fc
 2020-02-08 02:22:53 +00:00
Automerger Merge Worker
4ade6221dc [automerger skipped] DO NOT MERGE - Merge QQ1A.200205.002 into master am: 5b8d15365a am: 259cacf8f6 am: c52c0b057a -s ours 
am skip reason: subject contains skip directive

Change-Id: I7e17c4dec5357234d1bdb80d85422b37470f12ab
 2020-02-08 02:22:10 +00:00
Automerger Merge Worker
70c3352ca8 Merge "API review cleanups." am: 6c812cc994 
Change-Id: I299dc3b97cd8f3164b515e6b265dc3acf972076e
 2020-02-08 02:15:30 +00:00
Automerger Merge Worker
942fb889de [automerger skipped] Merge changes from topic "lights-manager" am: 59401aab80 am: bd0f475895 am: 06dd4617c0 -s ours 
am skip reason: Change-Id I2db7f2caa432cd1e2389ea5ca6544200ada18675 with SHA-1 090d02ca84 is in history

Change-Id: I863d70ee369ad7c8d69d8ecbc8d05bcc93faca2b
 2020-02-08 02:15:19 +00:00
Automerger Merge Worker
a6e769cccf [automerger skipped] Add Lights AIDL HAL support to LightsService am: 4c5ac6b353 am: ff470b2f01 am: e27dd578a1 -s ours 
am skip reason: Change-Id Ic9b4fbc5570ea49cff903df27c9714bed23bf98c with SHA-1 c176fb8fa4 is in history

Change-Id: Ia18c06753e501b7a4dd1b01e626df77418738f4f
 2020-02-08 02:15:16 +00:00
Automerger Merge Worker
765913391f [automerger skipped] Rename Light to LogicalLight to avoid namespace conflicts when adding am: b19593a5c3 am: b500354545 am: 7cb841c9a8 -s ours 
am skip reason: Change-Id Id5f7bfc74cef6d584c42712fcbea816e456b8b2d with SHA-1 f773e10a99 is in history

Change-Id: I7744f71cdc85df03644cb7a293e9c0537bd7d9ac
 2020-02-08 02:15:07 +00:00
Philip P. Moltmann
a33c208f0c Merge "Make PermPolicySvc based on uid" 2020-02-08 02:14:03 +00:00
Greg Kaiser
498fded002 Merge "Revert "Enable insets flag for IME"" 2020-02-08 02:12:56 +00:00
TreeHugger Robot
79ca0c84db Merge "Show augmented autofill suggestion inline iff both augmented autofill service and ime support inline." 2020-02-08 02:01:40 +00:00
Robert Luo
84e645c3a8 Merge "Add new actions for Battery feature data collection" 2020-02-08 01:59:45 +00:00
Treehugger Robot
6c812cc994 Merge "API review cleanups." 2020-02-08 01:57:13 +00:00
Automerger Merge Worker
5286e87ab0 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: 71ab50ae23 am: 75a312ca39 
Change-Id: I10ff00f3a526cd1cea18638d15d7bc3a9bfe992a
 2020-02-08 01:56:43 +00:00
Automerger Merge Worker
c52c0b057a DO NOT MERGE - Merge QQ1A.200205.002 into master am: 5b8d15365a am: 259cacf8f6 
Change-Id: I6c031f32b48037b494f7413636bb87910f0de58c
 2020-02-08 01:55:27 +00:00
Automerger Merge Worker
06dd4617c0 Merge changes from topic "lights-manager" am: 59401aab80 am: bd0f475895 
Change-Id: I2f4ba72c3b56b5ae0f9ec82e368281734b9a9715
 2020-02-08 01:53:41 +00:00
Automerger Merge Worker
e27dd578a1 Add Lights AIDL HAL support to LightsService am: 4c5ac6b353 am: ff470b2f01 
Change-Id: I136a64d1cf28ef6aebb01b2afe8442030f65b8ab
 2020-02-08 01:53:37 +00:00
Automerger Merge Worker
7cb841c9a8 Rename Light to LogicalLight to avoid namespace conflicts when adding am: b19593a5c3 am: b500354545 
Change-Id: Ie5b302872b11cab619b13ed071d6e24992d785f6
 2020-02-08 01:53:34 +00:00
Bill Yi
70acb6a281 Import translations. DO NOT MERGE 
Change-Id: I6f5be0931a6fc998f4a845e34ac9599c9ec8d01b
Auto-generated-cl: translation import
 2020-02-07 17:48:15 -08:00
Feng Cao
e93d586c0f Make suggestion chip non-focusable to remove the background shadow 
Test: manual
Bug: 146535667

Change-Id: I9d3289014d9ae542f4ebd46309530c6b80801892
 2020-02-07 17:44:57 -08:00
Automerger Merge Worker
75a312ca39 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: 71ab50ae23 
Change-Id: I891ec5a0b23466041a6ded4137dbcfc687c04dda
 2020-02-08 01:41:47 +00:00
Automerger Merge Worker
259cacf8f6 DO NOT MERGE - Merge QQ1A.200205.002 into master am: 5b8d15365a 
Change-Id: I84a27d63253d4c60ee86b25587ae8bd6af659da3
 2020-02-08 01:38:43 +00:00
Automerger Merge Worker
bd0f475895 Merge changes from topic "lights-manager" am: 59401aab80 
Change-Id: I9a45024b3cb557afd4fb09e69692f35c4372c928
 2020-02-08 01:37:15 +00:00
Automerger Merge Worker
ff470b2f01 Add Lights AIDL HAL support to LightsService am: 4c5ac6b353 
Change-Id: I7ca19b8364677533c2e38ed92b2284731530b2c2
 2020-02-08 01:37:10 +00:00
Automerger Merge Worker
b500354545 Rename Light to LogicalLight to avoid namespace conflicts when adding am: b19593a5c3 
Change-Id: I734544eaed5e6f97175bb53e29ed4225c4784a0f
 2020-02-08 01:37:05 +00:00
Treehugger Robot
71ab50ae23 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" 2020-02-08 01:29:23 +00:00
Treehugger Robot
59401aab80 Merge changes from topic "lights-manager" 
* changes:
  Add LightsManager implementation to LightsService
  Add Lights AIDL HAL support to LightsService
  Rename Light to LogicalLight to avoid namespace conflicts when adding AIDL HAL lights support.
 2020-02-08 01:23:29 +00:00