Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
449,930 Commits 3 Branches 0 Tags
57e4d5b80ad772d7bf492f571a8d5a90135cd07b
Commit Graph

449930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
57e4d5b80a Import translations. DO NOT MERGE 
Change-Id: I7a8a9b598689bb9ad2e18d27de05e8334ee7b41e
Auto-generated-cl: translation import
 2019-11-06 14:29:56 -08:00
Joshua Baxter
83f6768e9b docs: fix a couple of minor typos am: 9bc8e0cb53 am: 7cebef8505 am: ffcb948028 
am: a5fde3c266

Change-Id: I7737e9479ef6adc1ebe4c0e828eb4516daf20c0d
 2019-11-06 14:17:40 -08:00
TreeHugger Robot
d41a725956 Merge "Generalized AppWindowThumbnail as WindowContainerThumbnail" 2019-11-06 22:16:20 +00:00
Joshua Baxter
8ee6203bcb Merge "docs: fix typo" into qt-dev am: 4fa49b4541 am: 5cc0a67503 am: ffbebe1fde 
am: 3cccaaf983

Change-Id: I8c3efd39e090ed07931afc4b80992fc6a874b561
 2019-11-06 14:15:17 -08:00
Joshua Baxter
7d7562e9ac Merge "docs: fix typos" into qt-dev am: d732cbb7bd am: 77514bd077 am: 208e73ca76 
am: fc66e118db

Change-Id: I2f3df59cdd979fc3543dc18ef9beb3ea06061030
 2019-11-06 14:11:41 -08:00
Joshua Baxter
a5fde3c266 docs: fix a couple of minor typos am: 9bc8e0cb53 am: 7cebef8505 
am: ffcb948028

Change-Id: Id084d29a91ae1a68176439c403e7475b2d497f9d
 2019-11-06 14:05:28 -08:00
TreeHugger Robot
6f19129b1c Merge "Replace deprecated InstrumentationRegistry (2/n)" 2019-11-06 22:05:07 +00:00
Joshua Baxter
3cccaaf983 Merge "docs: fix typo" into qt-dev am: 4fa49b4541 am: 5cc0a67503 
am: ffbebe1fde

Change-Id: I2e9a580dad500431c1eca2aabed8d2c723009bd4
 2019-11-06 14:01:24 -08:00
Joshua Baxter
fc66e118db Merge "docs: fix typos" into qt-dev am: d732cbb7bd am: 77514bd077 
am: 208e73ca76

Change-Id: I492eb05a7292f17df50190ae5325e5c99bb0407e
 2019-11-06 13:57:03 -08:00
Lyn Han
270e2d23e3 [automerger skipped] Merge "Fix dot for smart reply and bubble groups [DO NOT MERGE]" into qt-qpr1-dev am: 9b61e99398 
am: 9d80afbcbb -s ours
am skip reason: subject contains skip directive

Change-Id: I0826b5c04f465e3e590cd0e44428a855a5ceaed7
 2019-11-06 13:56:47 -08:00
Lyn Han
ac0049c609 [automerger skipped] Fix dot for smart reply and bubble groups [DO NOT MERGE] am: 58a5522283 
am: 6f095aba5c -s ours
am skip reason: subject contains skip directive

Change-Id: I094625eecff8c4ec91b92639bc97f21f25b9122f
 2019-11-06 13:54:15 -08:00
Joshua Baxter
11cffb4eb2 Merge "docs: fix typos" into qt-dev am: 7bd7afabb8 am: 53fba24239 am: 20148858f5 
am: e9a62d5f86

Change-Id: I5a3342cbe5e225806315ab6454fc6b874f21f3a2
 2019-11-06 13:50:30 -08:00
Joshua Baxter
ffcb948028 docs: fix a couple of minor typos am: 9bc8e0cb53 
am: 7cebef8505

Change-Id: I0e278a53b781580041315e74a669ae6cca3340bf
 2019-11-06 13:50:13 -08:00
Joshua Baxter
ffbebe1fde Merge "docs: fix typo" into qt-dev am: 4fa49b4541 
am: 5cc0a67503

Change-Id: I1558247d9dfdb621288b3f419447985ca0dbf88f
 2019-11-06 13:46:35 -08:00
Lyn Han
9d80afbcbb Merge "Fix dot for smart reply and bubble groups [DO NOT MERGE]" into qt-qpr1-dev 
am: 9b61e99398

Change-Id: Ia53896fa9aa692a67f7bde4a552db62895611a36
 2019-11-06 13:45:41 -08:00
Lyn Han
6f095aba5c Fix dot for smart reply and bubble groups [DO NOT MERGE] 
am: 58a5522283

Change-Id: Ic49476436f92647435fc1e6c214679545c706361
 2019-11-06 13:45:39 -08:00
Roshan Pius
a48f24e460 Merge "wifi: Allow wifi to get INTERACT_ACROSS_USERS_FULL" 2019-11-06 21:45:39 +00:00
Joshua Baxter
208e73ca76 Merge "docs: fix typos" into qt-dev am: d732cbb7bd 
am: 77514bd077

Change-Id: I57d192cc779667458923fed99f71c7bf0ae1b8ff
 2019-11-06 13:41:26 -08:00
TreeHugger Robot
33502f2109 Merge "Move the ImsService tests to CTS, requiring @TestApi" 2019-11-06 21:41:19 +00:00
Joshua Baxter
e9a62d5f86 Merge "docs: fix typos" into qt-dev am: 7bd7afabb8 am: 53fba24239 
am: 20148858f5

Change-Id: Ibf2e7a9c1b8e31669226e4b27c5a09ae2ed1a219
 2019-11-06 13:41:00 -08:00
TreeHugger Robot
9b61e99398 Merge "Fix dot for smart reply and bubble groups [DO NOT MERGE]" into qt-qpr1-dev 2019-11-06 21:33:57 +00:00
Joshua Baxter
7cebef8505 docs: fix a couple of minor typos 
am: 9bc8e0cb53

Change-Id: Id2139f5f685d2c4677d5e06ff7fda4b74e61a30c
 2019-11-06 13:33:53 -08:00
Joshua Baxter
20148858f5 Merge "docs: fix typos" into qt-dev am: 7bd7afabb8 
am: 53fba24239

Change-Id: I2d60f8aa3371e1fc77146e3571a3a89c5acaa253
 2019-11-06 13:28:46 -08:00
Joshua Baxter
5cc0a67503 Merge "docs: fix typo" into qt-dev 
am: 4fa49b4541

Change-Id: Id779613ee9071a65ef08b270ad5ffb2d0c5e9b2c
 2019-11-06 13:28:25 -08:00
Joshua Baxter
77514bd077 Merge "docs: fix typos" into qt-dev 
am: d732cbb7bd

Change-Id: Ie5d13bceacd0392bebb797456c7ed3d0d2d906da
 2019-11-06 13:26:00 -08:00
Joshua Baxter
53fba24239 Merge "docs: fix typos" into qt-dev 
am: 7bd7afabb8

Change-Id: I2d9f0e92ac269000c9d0031d81e787688e44bdea
 2019-11-06 13:21:12 -08:00
Joshua Baxter
9bc8e0cb53 docs: fix a couple of minor typos 
test: make ds-docs
Change-Id: Ia68f66980e447209efb8102a156f78314c199f56
bug: 36979979
Exempt-From-Owner-Approval: docs-only change
 2019-11-06 21:13:25 +00:00
Joshua Baxter
4fa49b4541 Merge "docs: fix typo" into qt-dev 2019-11-06 21:02:42 +00:00
Joshua Baxter
f4d07d459c docs: fix typo 
Change-Id: I843a3d94e48335babffdf8a226fa9e3d00c5bbf1
test: make ds-docs
bug: 144041941
 2019-11-06 21:02:33 +00:00
Joshua Baxter
d732cbb7bd Merge "docs: fix typos" into qt-dev 2019-11-06 21:01:14 +00:00
Joshua Baxter
914bda7659 docs: fix typos 
test: make ds-docs
bug: 36974889
 2019-11-06 21:01:00 +00:00
Joshua Baxter
7bd7afabb8 Merge "docs: fix typos" into qt-dev 2019-11-06 20:54:08 +00:00
Joshua Baxter
ec27701c78 docs: fix typos 
Change-Id: Ie238360300cac54bd4717b4ff75d5534f82e0307
test: make ds-docs
bug: 36948876
 2019-11-06 20:53:55 +00:00
Dheeraj Shetty
07a945d97b Merge "Fix APN build" am: d3d5d5a962 am: 53122f12b4 
am: 1a5a6327a5

Change-Id: I1e6a2330ee121d1439f0142982b4b11453cb841b
 2019-11-06 12:04:12 -08:00
Robert Shih
be9b24a52c Merge "media jni: remove Parcel from IDrmClient interface" 2019-11-06 19:58:10 +00:00
Dheeraj Shetty
1a5a6327a5 Merge "Fix APN build" am: d3d5d5a962 
am: 53122f12b4

Change-Id: I841c37a026ee1a9e377ed77702b32b365e6a9a8a
 2019-11-06 11:51:40 -08:00
Dheeraj Shetty
53122f12b4 Merge "Fix APN build" 
am: d3d5d5a962

Change-Id: I3e2d692aae51208f82b9bb90f69c4b32ed483f5f
 2019-11-06 11:40:52 -08:00
Treehugger Robot
d3d5d5a962 Merge "Fix APN build" 2019-11-06 19:24:58 +00:00
Brad Ebinger
045b3960e7 [automerger skipped] Merge "Fix new registration APIs as per API council guidelines" am: bfc11892e1 am: 4aea29f73f 
am: bac75672f9 -s ours
am skip reason: change_id I634cbf2b9cd91bfa53729ccc4bfc92e9c4808976 with SHA1 709081287b is in history

Change-Id: I8a7d5f3157bcf01485834d9477fe2efa66bacf23
 2019-11-06 11:02:55 -08:00
Brad Ebinger
bac75672f9 Merge "Fix new registration APIs as per API council guidelines" am: bfc11892e1 
am: 4aea29f73f

Change-Id: I2990bb1024cdbeb5c36be3c3f1847f3312ab5c2e
 2019-11-06 10:54:25 -08:00
Brad Ebinger
4aea29f73f Merge "Fix new registration APIs as per API council guidelines" 
am: bfc11892e1

Change-Id: Iebb8aa5818105e683b1b590fcc819a34db739ad6
 2019-11-06 10:47:31 -08:00
Brad Ebinger
bfc11892e1 Merge "Fix new registration APIs as per API council guidelines" 2019-11-06 18:28:44 +00:00
lumark
bc0032a39c Generalized AppWindowThumbnail as WindowContainerThumbnail 
Also modified some miscellaneous code logics related animation.

Bug: 142617871
Bug: 131661052
Test: Refactoring, existing tests pass.
Change-Id: Ia06d500bc6b6bf247d840d14cc81d2358af2d400
 2019-11-07 01:56:56 +08:00
Jordan Liu
3ad8b97d66 [automerger skipped] Merge "Add CDMA SCP message handling to CellBroadcast module" am: f0e75a656c am: 84913b808f 
am: 6404defafe -s ours
am skip reason: change_id I4729cb98dec46560aefee570af58ff4a737cacf3 with SHA1 e89a1eb05d is in history

Change-Id: Ic6e83e6369373389675455a78c7d3c733d4998c8
 2019-11-06 09:56:45 -08:00
TreeHugger Robot
c269efc0a5 Merge "Remove DozeHost from Components." 2019-11-06 17:51:24 +00:00
Jordan Liu
6404defafe Merge "Add CDMA SCP message handling to CellBroadcast module" am: f0e75a656c 
am: 84913b808f

Change-Id: Icfc20849b7d52a4acf16150512b26dfe1e1b11fc
 2019-11-06 09:50:00 -08:00
Hongwei Wang
a3cf907612 Merge "Remove synchronized call in PinnedStackController" 2019-11-06 17:46:34 +00:00
Hongwei Wang
e79f26afa8 Remove synchronized call in PinnedStackController 
Instead, rely on WindowManagerService.mGlobalLock for ordering and
avoiding deadlocks.

Bug: 143543347
Test: atest PinnedStackController
Test: atest NotificationManagerTest
Change-Id: Idcb426064892c9bb1ce7895f569ddbecb1f6b7b6
 2019-11-06 17:45:41 +00:00
Jordan Liu
84913b808f Merge "Add CDMA SCP message handling to CellBroadcast module" 
am: f0e75a656c

Change-Id: I25dcb98f1452678717c2be69ddd1029ed1761e33
 2019-11-06 09:39:14 -08:00
Muhammad Qureshi
541ed6fd90 Merge "Add KeyValuePairs support to StatsEvent." 2019-11-06 17:16:30 +00:00