Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
443,925 Commits 3 Branches 0 Tags
ebda19f6d34e3d7d67bf9ec856126751bb07d6fb
Commit Graph

443925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
70c3352ca8 Merge "API review cleanups." am: 6c812cc994 
Change-Id: I299dc3b97cd8f3164b515e6b265dc3acf972076e
 2020-02-08 02:15:30 +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
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
Automerger Merge Worker
1c0b7deee8 Merge "Remoe usage of CollectionUtils as it's not exposed to mainline modules." am: 146dde2a0c am: 37de3bd13a 
Change-Id: I554b14e93578806de734fcc1ec292b4087e11862
 2020-02-07 23:34:45 +00:00
Automerger Merge Worker
37de3bd13a Merge "Remoe usage of CollectionUtils as it's not exposed to mainline modules." am: 146dde2a0c 
Change-Id: I091fbe2ea8cfc554838ff81ba350d7514e7c1e18
 2020-02-07 23:20:40 +00:00
Xiangyu/Malcolm Chen
146dde2a0c Merge "Remoe usage of CollectionUtils as it's not exposed to mainline modules." 2020-02-07 23:05:08 +00:00
Grace Jia
83cbd8f886 API review cleanups. 
1) Make all exposed APIs SystemApi, instead of public APIs.
2) Indicate SipException when errors happen.
3) Change API name from getListOfProfiles to getProfiles

Test: make, atest TeleServiceTests:PhoneGlobalsTest
Bug: 148604927
Change-Id: Idae8353cb27ba8cc461f68e66c5f7fe14ecc9354
 2020-02-07 12:20:38 -08:00
Automerger Merge Worker
99ee66f7fc Merge "Migrate StatsHal" am: e566dd697b am: 96e90c3ae6 
Change-Id: I79fd074575472c7d92dff0a264bbbeae804655be
 2020-02-07 18:34:20 +00:00
Automerger Merge Worker
96e90c3ae6 Merge "Migrate StatsHal" am: e566dd697b 
Change-Id: I7ba166dc3b0d0e41452dcd581b8bc8165ef6b0e2
 2020-02-07 18:17:51 +00:00
Jeffrey Huang
e566dd697b Merge "Migrate StatsHal" 2020-02-07 18:03:04 +00:00
Automerger Merge Worker
32db483074 Merge "Make FinalizerTimeoutMs and ThreadSuspendTimeout system prop" am: e021e1f78e am: deeb2974c0 
Change-Id: I0ce94931b91e03be7030cd71977d7482417d7253
 2020-02-07 17:22:51 +00:00
Automerger Merge Worker
836124db7e Merge "Fix typo in ConnectivityDiagnosticsManager constant." am: d222986acd am: 09d92456fa 
Change-Id: Iab752a848a8017fbfdc4517502d5a39d8201a682
 2020-02-07 17:22:37 +00:00
Automerger Merge Worker
deeb2974c0 Merge "Make FinalizerTimeoutMs and ThreadSuspendTimeout system prop" am: e021e1f78e 
Change-Id: If21e3471882328a5cd7d2da50bf96a2a6be35d69
 2020-02-07 17:08:50 +00:00
Automerger Merge Worker
09d92456fa Merge "Fix typo in ConnectivityDiagnosticsManager constant." am: d222986acd 
Change-Id: Icaae03ca1895de4012deed1c1b81b16fad4ba439
 2020-02-07 17:08:20 +00:00
Lokesh Gidra
e021e1f78e Merge "Make FinalizerTimeoutMs and ThreadSuspendTimeout system prop" 2020-02-07 17:02:46 +00:00
Cody Kesting
d222986acd Merge "Fix typo in ConnectivityDiagnosticsManager constant." 2020-02-07 16:57:19 +00:00
Automerger Merge Worker
badf5be580 Merge "Always report non-null TetherStatesParcel" am: dd1b26bf25 am: 5aeb1cdb03 
Change-Id: I7d36160a1b58d579cb4164bd1ae7e23381643c01
 2020-02-07 11:18:13 +00:00
Automerger Merge Worker
5aeb1cdb03 Merge "Always report non-null TetherStatesParcel" am: dd1b26bf25 
Change-Id: If5193dba1150fdf0c04e9585367206b11c8d04a4
 2020-02-07 11:05:53 +00:00
Mark Chien
dd1b26bf25 Merge "Always report non-null TetherStatesParcel" 2020-02-07 10:48:28 +00:00
Automerger Merge Worker
26f49e7b75 Merge "Add a null home activity to Shell.apk" am: fd2ba540df am: 24f93a2b48 
Change-Id: Id4d552ba51e96c13c2e1b958d96ce119155161d4
 2020-02-07 08:38:20 +00:00
Automerger Merge Worker
24f93a2b48 Merge "Add a null home activity to Shell.apk" am: fd2ba540df 
Change-Id: I6f789c032dfd105ff81944ff3d6965673485fcac
 2020-02-07 08:21:01 +00:00
Treehugger Robot
fd2ba540df Merge "Add a null home activity to Shell.apk" 2020-02-07 07:59:39 +00:00
Automerger Merge Worker
6eb36aca5b Merge "NetworkPolicyManager: Add @SystemApi for mainlne module" am: c8b7cff7f4 am: 3ba215eefd 
Change-Id: I5682ed5f580f762beb0bf552c44d73495077cad3
 2020-02-07 06:26:06 +00:00
Automerger Merge Worker
3ba215eefd Merge "NetworkPolicyManager: Add @SystemApi for mainlne module" am: c8b7cff7f4 
Change-Id: Iba93c5f26010f647c78aef359e907d5f3b40fde0
 2020-02-07 06:01:53 +00:00
Aaron Huang
c8b7cff7f4 Merge "NetworkPolicyManager: Add @SystemApi for mainlne module" 2020-02-07 05:47:45 +00:00
Isaac Chen
6b1c4a9e09 Add a null home activity to Shell.apk 
In configurations where AOSP Settings.apk is not included, there might
not be any home activity. E.g. CSI doesn't have Settings.apk.

This CL adds a null home activity to Shell.apk, which is in CSI,
so the framework can be in a sane state. Without such null home
activity in CSI, package manager fails to install any APKs.

Bug: 148044842
Test: $ lunch csi_arm64-userdebug; m -j
      # Flash CSI to a Pixel (with AVB disabled) and reboot
      $ m DeviceHealthChecks
      $ adb install $OUT/testcases/DeviceHealthTests/arm64/DeviceHealthTests.apk
      Performing Streamed Install
      Success

Change-Id: I87999e30298bbe42af64f28e88fc6dc5975f1ca3
 2020-02-07 12:50:39 +08:00
Automerger Merge Worker
66f0d732ff Merge "Add more character sets" am: 97065a1e01 am: 9dc13adfe8 
Change-Id: Idc1bb48601c052ec51e9091a28cde7973d1faf8f
 2020-02-07 04:45:36 +00:00
Automerger Merge Worker
9dc13adfe8 Merge "Add more character sets" am: 97065a1e01 
Change-Id: I1c597b2c27845327e3e263ca7ea4cf6933ce3ad6
 2020-02-07 04:29:46 +00:00
Treehugger Robot
97065a1e01 Merge "Add more character sets" 2020-02-07 04:09:07 +00:00
Iris Chang
c2a97a02b1 Add more character sets 
Add more character sets in CharacterSets.java to support more charsets.
These charsets are from http://www.iana.org/assignments/character-sets/
If MMS contains undefined charset value the corresponding field may not
be parsed correctly.
These charsets are from http://www.iana.org/assignments/character-sets/

Test: Receive MMS contains extended charsets texts, check if the text
could be parsed correctly.

Bug: 143253159

Change-Id: Id501dbaa9dfcc2cb28089430ed0b1bd3f2906bed
 2020-02-07 04:08:42 +00:00
Automerger Merge Worker
99ac0e99fc Merge changes from topic "update_profile_api" am: dced19175b am: e035a12367 
Change-Id: Iaa111d4a20144a0a555bc617c3e7db86d09cb21a
 2020-02-07 03:11:48 +00:00
Automerger Merge Worker
43e7f1d062 Update LocalBluetoothProfile api am: a41c2eb2da am: 8479173b69 
Change-Id: If729a1afbf224d243346ee6a7ef71477596a7d56
 2020-02-07 03:11:44 +00:00
Automerger Merge Worker
fe41901208 Update connect/disconnect Bluetooth api am: 01e574ab74 am: 39a73b3955 
Change-Id: I74026a38ae917875d592d5434b326b7ad8f81a9a
 2020-02-07 03:11:42 +00:00
Automerger Merge Worker
e035a12367 Merge changes from topic "update_profile_api" am: dced19175b 
Change-Id: I512066421204d53b25bdbb0e843c9fe6cca170ea
 2020-02-07 02:57:45 +00:00
Automerger Merge Worker
8479173b69 Update LocalBluetoothProfile api am: a41c2eb2da 
Change-Id: I2af4e18525ddf8189c60c0e75fce6d5c6982c904
 2020-02-07 02:57:42 +00:00
Automerger Merge Worker
39a73b3955 Update connect/disconnect Bluetooth api am: 01e574ab74 
Change-Id: Iae132efdb0b4d8a7de20b5fb279ad8def07411d5
 2020-02-07 02:57:38 +00:00
Treehugger Robot
dced19175b Merge changes from topic "update_profile_api" 
* changes:
  Use new bt api to set active device
  Update LocalBluetoothProfile api
  Update connect/disconnect Bluetooth api
 2020-02-07 02:46:12 +00:00
Ivailo Karamanolev
3e376b79ce Add LightsManager implementation to LightsService 
Includes backend code to support LightsManager binder calls and route
them to the HALs.

Bug: 144979010
Bug: 144978691
Bug: 142715294
Change-Id: I0080972620ba7a3fb1197cdd0288287d3cfa8780
Fix: 142230898
Test: atest LightsManagerTest
Test: atest LightsServiceTest
Merged-In: I2db7f2caa432cd1e2389ea5ca6544200ada18675
 2020-02-07 02:11:18 +01:00