Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
366,642 Commits 3 Branches 0 Tags
c94156efb7052d472bfbdce53ea5fcc01fcff364
Commit Graph

366642 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
c94156efb7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev 
am: d60da1cc7b  -s ours

Change-Id: Id3472c2da96db6ec82929bdec1bfd304329658ff
 2018-04-04 11:55:24 -07:00
TreeHugger Robot
d60da1cc7b Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-04 18:42:38 +00:00
Rohan Shah
1b21e84679 Merge "[Notif] Cache bool instead of manager/info" into pi-dev 
am: ae26aa74a3

Change-Id: I55973ab35d88a87daf0fb3e9e459d3bc57b33585
 2018-04-04 11:05:57 -07:00
Dmitry Dementyev
45f2f231cf Merge "Remove deprecated recoverable keystore classes." into pi-dev 
am: 654598b542

Change-Id: I883e6e98285fc9cb05cd46d6f88efda2437655ca
 2018-04-04 11:00:39 -07:00
TreeHugger Robot
ae26aa74a3 Merge "[Notif] Cache bool instead of manager/info" into pi-dev 2018-04-04 18:00:31 +00:00
Dmitry Dementyev
5ab1c1eb8a Merge "Remove deprecated RecoveryController API." into pi-dev 
am: ce70473a89

Change-Id: I516537e788ea873cd85d58348897d386b8bd5a5d
 2018-04-04 10:56:16 -07:00
Dmitry Dementyev
654598b542 Merge "Remove deprecated recoverable keystore classes." into pi-dev 2018-04-04 17:42:11 +00:00
Dmitry Dementyev
ce70473a89 Merge "Remove deprecated RecoveryController API." into pi-dev 2018-04-04 17:41:51 +00:00
David Brazdil
5563e95a2e Merge "Move hidden API from vendor to light grey" into pi-dev 
am: b622906dc5

Change-Id: I33b7b4afd232eb305fdb1dac42d7b8980ea1cbd6
 2018-04-04 10:37:14 -07:00
Bill Yi
f97bcef5db Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ifbca808c357b04b1c5cf25b6cc1852f447c221a5
 2018-04-04 10:33:28 -07:00
Winson Chung
4f442bd3be Merge "Revert "Nav icons and quick step states are determined by service enabled"" into pi-dev 
am: b4da14cde9

Change-Id: I1eb26e9d51d35bc7eca7bf9244ae7861f2e47c1f
 2018-04-04 10:28:59 -07:00
David Brazdil
b622906dc5 Merge "Move hidden API from vendor to light grey" into pi-dev 2018-04-04 17:23:30 +00:00
Pavel Maltsev
88c39a1810 Merge "Add hasUnwantedCapability method" into pi-dev 
am: c5138d2697

Change-Id: I7feec81a3f1525055030ee16f34b8e7251e79b9b
 2018-04-04 10:15:10 -07:00
Lorenzo Colitti
0580e6b7fb Merge "Mark networks with OEM_PAID always restricted" into pi-dev 
am: c4020ffcab

Change-Id: I3fe4d11eec36eb20b44a8fdd2489b5fcdd144dff
 2018-04-04 10:09:54 -07:00
Winson Chung
b4da14cde9 Merge "Revert "Nav icons and quick step states are determined by service enabled"" into pi-dev 2018-04-04 17:01:47 +00:00
TreeHugger Robot
c5138d2697 Merge "Add hasUnwantedCapability method" into pi-dev 2018-04-04 16:55:14 +00:00
TreeHugger Robot
c4020ffcab Merge "Mark networks with OEM_PAID always restricted" into pi-dev 2018-04-04 16:54:46 +00:00
Julia Reynolds
5a11c60e58 Merge "Ignore test" into pi-dev 
am: de3569ef84

Change-Id: I2e489c20b5d108af5aaa82fb63bed6350c155826
 2018-04-04 09:38:20 -07:00
Julia Reynolds
de3569ef84 Merge "Ignore test" into pi-dev 2018-04-04 16:28:45 +00:00
Andreas Gampe
74dbc80982 [automerger skipped] Merge "Frameworks: In the kill handler, ensure the logging handler was run" into pi-dev 
am: a926126a8b  -s ours

Change-Id: If9ce1eb81ef4b652727f098d1425442571656283
 2018-04-04 08:17:08 -07:00
Winson Chung
317ee507c2 Revert "Nav icons and quick step states are determined by service enabled" 
This reverts commit 8a7c97a16d.

Reason for revert: b/77566214

Bug: 77566214

Change-Id: Iba3ef20a304e3a47f1affe0b38598c7d7f0daef7
 2018-04-04 15:17:00 +00:00
TreeHugger Robot
a926126a8b Merge "Frameworks: In the kill handler, ensure the logging handler was run" into pi-dev 2018-04-04 15:04:37 +00:00
Julia Reynolds
27291c2630 Ignore test 
That is failing on virtual devices

Test: presubmit
Bug: 77570224
Change-Id: I333ecab616c9528b89a91071416794dc96b479c4
 2018-04-04 10:17:14 -04:00
Evan Laird
4bd0e0e76c Merge "Fix icon tinting when in split screen" into pi-dev 
am: 2edaf6244c

Change-Id: Id7e3fa40eae27514ccf247545cb2e6f40c13c412
 2018-04-04 06:57:27 -07:00
TreeHugger Robot
2edaf6244c Merge "Fix icon tinting when in split screen" into pi-dev 2018-04-04 13:42:10 +00:00
Jorim Jaggi
953564921b Only set client hidden if both hidden and hiddenRequested 
am: 752cd826b9

Change-Id: I490c1b0a0ee995511c6ac0f657c587055225a73a
 2018-04-04 06:34:01 -07:00
David Brazdil
c1d8d0a2f7 Move hidden API from vendor to light grey 
Bug: 64382372
Bug: 77328929
Test: make
Change-Id: I5141b56c79fad2bc6943ca6086eae53cad82d09c
 2018-04-04 14:26:08 +01:00
Jorim Jaggi
8dff817128 Merge "Add launch hint for RecentsAnimation" into pi-dev 
am: 0859b46d9d

Change-Id: I549a9c59eafcfce68e70ed5081fb9a487d181d92
 2018-04-04 06:25:59 -07:00
Jorim Jaggi
752cd826b9 Only set client hidden if both hidden and hiddenRequested 
This fixes a bug where clientHidden of Launcher was set to true
too early because of the following flow:
- Open app, then press home
- During the transition relaunch the app

This leads to a new transition being started for which
hiddenRequested=true for Launcher. Then, the old animation
finishes, before the new one gets stared, and Launcher gets client
hidden too early.

More generally this is correct because:
- if (hidden && hiddenRequested) both states agree
- if (!hidden && !hiddenRequested) both states agree as well
- if (hidden && !hiddenRequested): App is becoming visible before
transition has started, so we shouldn't set it to client hidden
- if (!hidden && hiddenRequested): App is becoming invisible before
transition has started. However we need to defer client hidden
until the transition is done.

Bug: 74220420
Test: Open/close apps quickly repeatedly
Test: go/wm-smoke
Change-Id: I6df107fb0be9d2d779c997f0ddf1315bf53d27a5
 2018-04-04 13:22:14 +00:00
Jorim Jaggi
0859b46d9d Merge "Add launch hint for RecentsAnimation" into pi-dev 2018-04-04 13:16:37 +00:00
Jorim Jaggi
011decd414 Merge "Update non-remote wallpaper anim to spec" into pi-dev 
am: 269fc17510

Change-Id: I6322fc3fc222adade3829e396554a210b0286bc9
 2018-04-04 06:12:28 -07:00
Jorim Jaggi
269fc17510 Merge "Update non-remote wallpaper anim to spec" into pi-dev 2018-04-04 13:03:33 +00:00
Jorim Jaggi
ac96052733 Add launch hint for RecentsAnimation 
We are starting an activity, so let's send launch hint to be
faster and consistent with other activity launches.

Test: Swipe up, check android.hardware.power in systrace
Bug: 73651529
Change-Id: Ia8f925d94cf6969d2501e00b86fa91617d093916
 2018-04-04 14:26:24 +02:00
Tony Mak
d3beaa57ae We should show custom title for suspend app dialog 
am: 706fbe7ed3

Change-Id: I59ca1b40ad78d6760724ea8d5297fe5cdccafc50
 2018-04-04 03:51:20 -07:00
Tony Mak
706fbe7ed3 We should show custom title for suspend app dialog 
BUG: 77523074

Test: Suspend an app, observe the new title.

Change-Id: I85f3d47e05332f7593a885130fd30dc5fd0a9960
 2018-04-04 10:38:12 +00:00
Aseem Kumar
0fb6af215b Merge "Throw ServiceSpecificException if calling app tries to initialize certificates with lower version. Earlier, the code just returned silently, giving no indication that updating certs failed." into pi-dev 
am: b2e6e45d00

Change-Id: Ie67aad45f125f5b33219e536753698a0892b5ed0
 2018-04-03 23:15:17 -07:00
TreeHugger Robot
b2e6e45d00 Merge "Throw ServiceSpecificException if calling app tries to initialize certificates with lower version. Earlier, the code just returned silently, giving no indication that updating certs failed." into pi-dev 2018-04-04 06:03:23 +00:00
Chen Xu
56a5ba9917 [automerger skipped] Merge "throw runtimeException for applicable TM APIs" am: 63437f247b 
am: 5a3c02ea22  -s ours

Change-Id: If6cf8231882da5d0b2ea481d2e8f3e3aaf2f9118
 2018-04-03 22:46:34 -07:00
Lorenzo Colitti
83c1e74b1e Mark networks with OEM_PAID always restricted 
Bug: 68762530
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest

Cherry-picked from AOSP with no conflicts

Merged-in: I173ee0a3bc1797d03ba34c5f025844eaada87ee4
Change-Id: I173ee0a3bc1797d03ba34c5f025844eaada87ee4
(cherry picked from commit efbacc0ccb)
 2018-04-04 05:35:54 +00:00
Chen Xu
5a3c02ea22 Merge "throw runtimeException for applicable TM APIs" 
am: 63437f247b

Change-Id: I3d0bcc477917c2fe27bf8024190d0f1bbd2fa585
 2018-04-03 21:52:13 -07:00
Mathieu Chartier
12d6976748 [automerger skipped] Merge "Add dedicated flag to control app image generation" am: abf1476dbe 
am: 21a2f48a0d  -s ours

Change-Id: Ia9dee120bc2f79e1705064e43de6736fa1b57d48
 2018-04-03 21:52:12 -07:00
Mathieu Chartier
21a2f48a0d Merge "Add dedicated flag to control app image generation" 
am: abf1476dbe

Change-Id: If1047435f3b74443e2508a265500acf4ed1c7b53
 2018-04-03 20:57:41 -07:00
Lucas Dupin
469e1a0cef Merge "Do not animate power menu when AOD" into pi-dev 
am: f0e74ae8ac

Change-Id: Idbe847b130420b80fd9a9b324670e7b29c7f5df6
 2018-04-03 20:54:00 -07:00
Hongwei Wang
92b5974b9c Merge "Adds comment how to deal with newly added audio usage" into pi-dev 
am: 3eaf39f3d0

Change-Id: Icc62373b9d9c5fcd2212ddad1360df117d7cbd1f
 2018-04-03 20:36:36 -07:00
Lucas Dupin
f0e74ae8ac Merge "Do not animate power menu when AOD" into pi-dev 2018-04-04 03:33:05 +00:00
David Chen
df7f4dd36b Merge "Includes annotations with statsd reports." into pi-dev 
am: b61f80b42b

Change-Id: I0ec92b7e372617a4f45cf2ed22fbbe6b5ced8cbd
 2018-04-03 20:31:42 -07:00
Felipe Leme
d015552483 Merge "Removed redundant autofill response info from ViewState dump()" into pi-dev 
am: dc4309544d

Change-Id: Ia781373c09d1b07b3a475685d88a326bd840ab62
 2018-04-03 20:21:42 -07:00
Chen Xu
63437f247b Merge "throw runtimeException for applicable TM APIs" 2018-04-04 03:17:39 +00:00
Remi NGUYEN VAN
1a6c9e6061 Merge "Add settings to configure default multipath quota." into pi-dev 
am: 9ab1da2052

Change-Id: I01e25079def030c43b0800d610590a3a6a5ac1be
 2018-04-03 20:17:22 -07:00
Pankaj Kanwar
e12daed05b Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"" into pi-dev 
am: d40c477b2e

Change-Id: Ie262a70023f4269f34c256d3040b0f3543c3d504
 2018-04-03 20:13:05 -07:00