Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
431,381 Commits 3 Branches 0 Tags
44117eac73456ca408ccdf0cd6e02daef707bd9d
Commit Graph

431381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay Patel
44117eac73 Merge "Fix AVR compatibility." am: 9e4df4985a am: babd85e24d am: 4088527e0c 
am: 77c749611d

Change-Id: Iab1720aa3db4602795a703aa12729e0c5cb1d635
 2019-08-26 11:31:19 -07:00
Da Xing
28f41e7ea2 [automerger skipped] Merge "DO NOT MERGE Crash app on foreground service notification error." am: 2eb5d0c183 -s ours am: 392130fee5 -s ours am: ec2c5c2e18 
am: 2476002005

Change-Id: Ie6cc66a3525379678a9362e9e31990adc85bc6e8
 2019-08-26 11:30:35 -07:00
Jack Yu
33b44ef558 [automerger skipped] Merge changes from topic "null_callback" am: 5ce391b313 am: 54e83aca93 am: e0afc80afb -s ours 
am: 3dba92b05c -s ours
am skip reason: change_id Ica0b7b810ffd5416ffd1b2b61f7ebc4af0dcb8ce with SHA1 09ef1cb126 is in history

Change-Id: Ib78d52fc87527346ebb96de70b4eff4c52b46b4f
 2019-08-26 11:28:18 -07:00
Jack Yu
64be6a44b4 [automerger skipped] Added debug messages and watchdog am: 594931f5d9 am: 75db0a70dd am: 966c2eb20d -s ours 
am: 1cf83928e5 -s ours
am skip reason: change_id I52dd126fddc1b1e8b18d5388a92aabaa3e2e48d5 with SHA1 36e2bfbaad is in history

Change-Id: I279add54ba84fd71c6b32788f14a551a31d6c779
 2019-08-26 11:28:03 -07:00
Pengquan Meng
8c1e4e80b1 resolve merge conflicts of 8f843170a4 to qt-qpr1-dev-plus-aosp 
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I52368e2d4d0585bb4a3b9401f6b268408952fcc6
 2019-08-26 00:18:52 -07:00
TreeHugger Robot
b402c73c4d Merge "NetworkStackClient: Refactor network stack process interaction" into qt-qpr1-dev-plus-aosp 2019-08-26 03:12:07 +00:00
Bill Yi
7c761462a6 [automerger skipped] Import translations. DO NOT MERGE 
am: 8e24ea2b4c -s ours
am skip reason: subject contains skip directive

Change-Id: I2b9ce480ada705dafe132ddfd993bfdcc73c8664
 2019-08-25 07:07:36 -07:00
Bill Yi
8e24ea2b4c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I360dde2e3d4eb2abc98c8bd3163ff8d9f7e41112
 2019-08-25 01:08:16 -07:00
Nagaraja
f7db1c403e Merge "Added Part & Addr Constants." am: f5d5de8a0f am: 633db92447 am: 40efe816dd 
am: e83d4f6c7d

Change-Id: I58a2924860ac78bf9611fdb887b7ea7e0a313caa
 2019-08-23 22:06:14 -07:00
Anna Trostanetski
8649477e74 Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2 am: 81af0fc8bb am: 20f25166c3 
am: 884ef46cdc

Change-Id: I11d25c6de70389b9f8fb74b914a247bca224e631
 2019-08-23 22:04:54 -07:00
Tobias Thierer
eb2a053326 Merge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c am: 41438c3730 am: b0c5a7af5a 
am: bc59f857aa

Change-Id: I09976c187805459c01101e2c8dd1b056fc2067a5
 2019-08-23 22:04:24 -07:00
Oscar Shu
edeb0313b7 Merge "avoid generating reserved local MACs" am: e5d5b73109 am: 65a98b4002 am: 4f05f46f13 
am: 02142d5462

Change-Id: Ib6e9917c555ab4ef5769aaca1ef6987dfbc185c1
 2019-08-23 22:03:56 -07:00
Android Build Merger (Role)
867daa7d82 Merge "Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a am: 3f1d5d92fc am: 1b6d718387 am: 4999ce080d" into qt-qpr1-dev-plus-aosp 2019-08-24 04:55:41 +00:00
Tobias Thierer
011723e214 Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a am: 3f1d5d92fc am: 1b6d718387 
am: 4999ce080d

Change-Id: Id03e7205f9f89ed34e53a4db7ff42f47138f1b48
 2019-08-23 21:54:32 -07:00
Android Build Merger (Role)
cb7ebeeca5 Merge "Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev am: 48a86feefe am: 23cdf1a48c" into qt-qpr1-dev-plus-aosp 2019-08-24 04:50:27 +00:00
Santos Cordon
66ee479ef3 Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev am: 48a86feefe 
am: 23cdf1a48c

Change-Id: Idb4bcdfca436af96c664fcd9c112c97f91bab15b
 2019-08-23 21:49:53 -07:00
Android Build Merger (Role)
1ff9dc9948 Merge "Merge "resolve merge conflicts of bd592e0439 to stage-aosp-master" into stage-aosp-master am: 6948bc8ce1 am: 2b52914445 am: 7a5ba3f59d" into qt-qpr1-dev-plus-aosp 2019-08-24 04:48:38 +00:00
Neil Fuller
6653f2b201 Merge "resolve merge conflicts of bd592e0439 to stage-aosp-master" into stage-aosp-master am: 6948bc8ce1 am: 2b52914445 
am: 7a5ba3f59d

Change-Id: Idcee9696bdb3cd2e65809f44eff0f8ff77782d27
 2019-08-23 21:48:12 -07:00
Android Build Merger (Role)
2da6de044c Merge "[automerger skipped] Merge "Remove DeviceConfig usage from NetworkStackClient" into stage-aosp-master am: d3f8bbc6c0 -s ours am: 56ac6f1ee7 -s ours am: a8aa5abfa0 -s ours am skip reason: change_id I423ca6ebb328f49b170baae0da9b8409a6429fcb with SHA1 7086666dea is in history" into qt-qpr1-dev-plus-aosp 2019-08-24 04:48:08 +00:00
Remi NGUYEN VAN
85f6ce6d5a [automerger skipped] Merge "Remove DeviceConfig usage from NetworkStackClient" into stage-aosp-master am: d3f8bbc6c0 -s ours am: 56ac6f1ee7 -s ours 
am: a8aa5abfa0 -s ours
am skip reason: change_id I423ca6ebb328f49b170baae0da9b8409a6429fcb with SHA1 7086666dea is in history

Change-Id: I4e623c46ddab96bd3b2e3b8a4841991ba8403f26
 2019-08-23 21:47:44 -07:00
Android Build Merger (Role)
e6495d4830 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b7ad07adad -s ours am: 7002e2a912 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-08-24 04:47:37 +00:00
Bill Yi
afe708f575 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b7ad07adad -s ours 
am: 7002e2a912 -s ours
am skip reason: subject contains skip directive

Change-Id: Ied0fc59fbc714c13bed330aed2a376e31e734f5f
 2019-08-23 21:47:14 -07:00
Android Build Merger (Role)
2c916241d5 Merge "Merge "Revert "Hold Display suspend blocker until doze starts"" into qt-r1-dev am: c5441b2894 am: 83392f441d" into qt-qpr1-dev-plus-aosp 2019-08-24 04:47:11 +00:00
Adrian Salido
ea14786442 Merge "Revert "Hold Display suspend blocker until doze starts"" into qt-r1-dev am: c5441b2894 
am: 83392f441d

Change-Id: Ia950108330b655dbd2b32cfacb580cbd9e13ad4a
 2019-08-23 21:46:48 -07:00
Android Build Merger (Role)
9607b9445c Merge "Merge "[automerger skipped] Disable modernize-use-trailing-return-type clang-tidy check am: fbafa5162a -s ours am: 68770715e3 -s ours am: 594180c68c -s ours am skip reason: change_id I7fbc10fb9044904f85f9a1ec6cf712ce3cec0a79 with SHA1 a0914d81ef is in history" into qt-qpr1-dev-plus-aosp 2019-08-24 04:46:44 +00:00
Yi Kong
8602e0fa79 Merge "[automerger skipped] Disable modernize-use-trailing-return-type clang-tidy check am: fbafa5162a -s ours am: 68770715e3 -s ours 
am: 594180c68c -s ours
am skip reason: change_id I7fbc10fb9044904f85f9a1ec6cf712ce3cec0a79 with SHA1 a0914d81ef is in history

Change-Id: I457cc035aeba0bfaf3b12bcc0e6460dc62924839
 2019-08-23 21:46:23 -07:00
Lucas Dupin
cfb337a15b [automerger skipped] Merge "Only delay bouncer if bypass is off" into qt-r1-dev am: 255777af56 -s ours 
am: 56b04b1721 -s ours
am skip reason: change_id I5ca00ebacda2c893bf62d5c882fe0a244b77f4fc with SHA1 d969b76224 is in history

Change-Id: I3bc1afd12e27b2507dd76c6051e6f85cfaaa4929
 2019-08-23 21:45:33 -07:00
Bill Yi
c40d399613 [automerger skipped] Import translations. DO NOT MERGE am: 1c99d77a36 -s ours 
am: 5c56a5e691 -s ours
am skip reason: subject contains skip directive

Change-Id: Id4136b467ace512ed708b9659d3bd5089d10dc07
 2019-08-23 21:41:31 -07:00
Long Ling
90fd03e874 Merge changes from topic "device_config_for_display_90" into qt-r1-dev am: 36da9bb9ff 
am: 6060198534

Change-Id: I9f9c83e619f086fc6fbf3eff3aebc5656f88bcbb
 2019-08-23 21:37:22 -07:00
Long Ling
74ee0f2db3 [automerger skipped] DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager am: 6f13f12213 -s ours 
am: 318adae023

Change-Id: I43ed5580d0b59c602b182b24c2cf3792522aa775
 2019-08-23 21:31:10 -07:00
Long Ling
cacba7e6e6 DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager am: 66e9298ac6 
am: 8da4630093

Change-Id: I45c21de677a0996ff87a99afefc17e0ae2b30812
 2019-08-23 21:31:04 -07:00
Sasha Smundak
f650335abe Merge "Android.bp file to convert current.api to XML format." into qt-dev-plus-aosp am: 73c6f3caa3 
am: ce8fa14129

Change-Id: Ie15979a0d72d397582155075d6423ca7cf6ba063
 2019-08-23 21:27:07 -07:00
Yi Kong
5b14cee5d2 Fix android-cloexec-pipe clang-tidy warning am: 1fa946a2f2 
am: 975bd46c43

Change-Id: Ifad6540e04c2b30d32ce189497f01d9d73edb87a
 2019-08-23 21:24:30 -07:00
Yi Kong
a4c4948089 Disable modernize-use-trailing-return-type clang-tidy check am: a0914d81ef 
am: 2b952530f3

Change-Id: I2ed2ec02386049840066c4be0eb8c96b8b858e71
 2019-08-23 21:17:53 -07:00
Roman Kiryanov
bf069a495b Merge "Fix integer overflow in make_timestamp_ns_locked" into qt-qpr1-dev 
am: 1d20f2096c

Change-Id: I963c419c063447a54b35aa1dff282cd058368af7
 2019-08-23 20:55:09 -07:00
Pengquan Meng
919efcaf54 Merge "Support WAC decoding in UMTS format" into qt-qpr1-dev 
am: b55bf00418

Change-Id: I53aff3c58b065a1124a23b0366b24eb26f5d46f8
 2019-08-23 20:54:14 -07:00
Inseob Kim
0c859fa482 resolve merge conflicts of 94c54dcee6a9728d63cef63c215d3ebd2de83831 to qt-r1-dev-plus-aosp 
am: f1ceee0166

Change-Id: If4355c580a8cd85fae95fd47510ca626f9c41bac
 2019-08-23 20:10:05 -07:00
Santos Cordon
23cdf1a48c Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev 
am: 48a86feefe

Change-Id: I15d47b96d0b937c720eca379d34a73da5f00a6d2
 2019-08-23 20:09:37 -07:00
Lucas Dupin
56b04b1721 [automerger skipped] Merge "Only delay bouncer if bypass is off" into qt-r1-dev 
am: 255777af56 -s ours
am skip reason: change_id I5ca00ebacda2c893bf62d5c882fe0a244b77f4fc with SHA1 d969b76224 is in history

Change-Id: Iba1881c5ec53168ee0352eb0ebd4b7ab689e52bc
 2019-08-23 20:09:10 -07:00
Bill Yi
5c56a5e691 [automerger skipped] Import translations. DO NOT MERGE 
am: 1c99d77a36 -s ours
am skip reason: subject contains skip directive

Change-Id: I3d6e4749aeae39286b21e7fb6021c84cc16c40d2
 2019-08-23 20:08:37 -07:00
Long Ling
6060198534 Merge changes from topic "device_config_for_display_90" into qt-r1-dev 
am: 36da9bb9ff

Change-Id: Ifd67f0360cd4c4b7d48c097af3254b54384f5a6a
 2019-08-23 20:08:11 -07:00
Long Ling
318adae023 [automerger skipped] DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager 
am: 6f13f12213 -s ours
am skip reason: SHA1 6f13f12213 skipped by user longling

Change-Id: I86d6aecba73b729a4292669a24d56b89c27645c6
 2019-08-23 20:03:00 -07:00
Long Ling
8da4630093 DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager 
am: 66e9298ac6

Change-Id: Id3f8518db5a906aeb626494309c7bb70fdf57d24
 2019-08-23 20:02:56 -07:00
Android Build Merger (Role)
e69976f523 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0c06bd1122 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-08-24 03:02:34 +00:00
Bill Yi
5d867015c2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 
am: 0c06bd1122 -s ours
am skip reason: subject contains skip directive

Change-Id: I96b3d30632f1b7a234d350320b8cd6e02e7c6e0d
 2019-08-23 20:01:48 -07:00
Adrian Salido
18e41d0727 Merge "DO NOT MERGE DMD: Support minimum refresh rate" into qt-r1-dev am: 9b94c35a54 
am: 729bac82ff

Change-Id: If4f1b9ccfd33ba52b092e72226db8d9c56b69f92
 2019-08-23 19:56:55 -07:00
Long Ling
33b9c6b9a1 [automerger skipped] DO NOT MERGE DMD: Support minimum refresh rate am: 86ce8f764b 
am: 9df1afdec3 -s ours
am skip reason: SHA1 9df1afdec3 skipped by user longling

Change-Id: Iba84a5b9dd9e9d1d22d3a743901df883ff0cddce
 2019-08-23 19:56:50 -07:00
TreeHugger Robot
1d20f2096c Merge "Fix integer overflow in make_timestamp_ns_locked" into qt-qpr1-dev 2019-08-24 02:40:41 +00:00
Pengquan Meng
b55bf00418 Merge "Support WAC decoding in UMTS format" into qt-qpr1-dev 2019-08-23 21:53:13 +00:00
Roshan Pius
f061a709b6 NetworkStackClient: Refactor network stack process interaction 
Refactor NetworkStackClient class to move the module service binding &
network stack process death monitoring to a separate class. This class
will only instantiated in the SystemServer process.
The new class |SystemServerToNetworkStackConnector| will be used from
the client classes corresponding to each module running on the network
stack process (NetworkStackClient, WifiStackClient, etc)

This has 2 main advantages:
a) Reduces code duplication (Otherwise the various Client classes need
to replicate the service bindding & process death monitoring).
b) Central crash recovery for the network stack process (Otherwise the
various Client classes will trigger multiple recovery for a single
network stack process crash).

Bug: 135679762
Test: Device boots up & connects to wifi networks.
Change-Id: I673581b0067b9a3f72dd68a3ab622c18183ebd2e
Merged-In: I673581b0067b9a3f72dd68a3ab622c18183ebd2e
(cherry picked from commit 7e6f5f5e08)
(cherry picked from commit b51c428f41)
 2019-08-23 19:04:48 +00:00