OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Remove Tigrinya (ti) from Settings languages" into oc-dr1-dev
TreeHugger Robot [Tue, 18 Jul 2017 23:35:19 +0000 (23:35 +0000)]
Merge "Remove Tigrinya (ti) from Settings languages" into oc-dr1-dev

7 years agoMerge "Disable lock screen by default for demo users" into oc-dr1-dev
Christine Franks [Tue, 18 Jul 2017 23:18:40 +0000 (23:18 +0000)]
Merge "Disable lock screen by default for demo users" into oc-dr1-dev

7 years agoMerge "Fixed the text alignment with RTL text" into oc-dr1-dev
Selim Cinek [Tue, 18 Jul 2017 22:43:46 +0000 (22:43 +0000)]
Merge "Fixed the text alignment with RTL text" into oc-dr1-dev

7 years agoMerge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c...
Phil Weaver [Tue, 18 Jul 2017 22:35:06 +0000 (22:35 +0000)]
Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c  -s ours am: 2a93c3d390 am: fef2328f35 am: 713a5420dd
am: 80c2eeedbb

Change-Id: I3183c725f1c8246481543832644518d5a2f566c0

7 years agoMerge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c...
Phil Weaver [Tue, 18 Jul 2017 22:26:36 +0000 (22:26 +0000)]
Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c  -s ours am: 2a93c3d390 am: fef2328f35
am: 713a5420dd

Change-Id: Ib3e9b5d8c8807a5e7f41f94d127008fc4f255f3e

7 years agoMerge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c...
Phil Weaver [Tue, 18 Jul 2017 22:19:02 +0000 (22:19 +0000)]
Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c  -s ours am: 2a93c3d390
am: fef2328f35

Change-Id: Ifc093c5a322bdb94717cfaebe9a9bab255e22789

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 ...
Phil Weaver [Tue, 18 Jul 2017 22:08:34 +0000 (22:08 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828  -s ours am: 954deb1c6e am: 37cf6265db  -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f  -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f am: ac700bc3c7 am: cfbe89ad32  -s ours
am: 442fc85852

Change-Id: I2332b61077924a2c8c5cdad5f440acb856db4acf

7 years agoMerge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c...
Phil Weaver [Tue, 18 Jul 2017 22:03:40 +0000 (22:03 +0000)]
Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c  -s ours
am: 2a93c3d390

Change-Id: I11d0935ed851e3c6076fb972a721d42e4903c6de

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 ...
Phil Weaver [Tue, 18 Jul 2017 21:59:29 +0000 (21:59 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828  -s ours am: 954deb1c6e am: 37cf6265db  -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f  -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f am: ac700bc3c7
am: cfbe89ad32  -s ours

Change-Id: I20741c5be51498f1d9a44452784fa59d31a12b2e

7 years agoDO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1...
Phil Weaver [Tue, 18 Jul 2017 21:57:14 +0000 (21:57 +0000)]
DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe  -s ours am: ff115bffb1 am: ccbac7e9e0  -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd  -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db am: d2c4007d8a am: 982cf0d212  -s ours
am: 4607ec8f6d

Change-Id: I39e8256ddc46d1af59a08fdaf8af02795cca8a36

7 years agoMerge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8
Phil Weaver [Tue, 18 Jul 2017 21:55:27 +0000 (21:55 +0000)]
Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8
am: 4fa8b51c0c  -s ours

Change-Id: I72897fd488d26ed7c3e1462c1755e10d2b7dfbe8

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 ...
Phil Weaver [Tue, 18 Jul 2017 21:50:57 +0000 (21:50 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828  -s ours am: 954deb1c6e am: 37cf6265db  -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f  -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f
am: ac700bc3c7

Change-Id: If57bab0ee9d5459286339845284adb3f0163c401

7 years agoDO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1...
Phil Weaver [Tue, 18 Jul 2017 21:50:05 +0000 (21:50 +0000)]
DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe  -s ours am: ff115bffb1 am: ccbac7e9e0  -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd  -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db am: d2c4007d8a
am: 982cf0d212  -s ours

Change-Id: Ia2a716d38e67874beb146f12849dd2f3f1356903

7 years agoMerge "Back-port fixes for b/62196835" into nyc-dev
Phil Weaver [Tue, 18 Jul 2017 21:44:32 +0000 (21:44 +0000)]
Merge "Back-port fixes for b/62196835" into nyc-dev
am: 0b0834fbe8

Change-Id: Ie3ade206625af7f69d497935397cd3094a1555fb

7 years agoBack-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5...
Phil Weaver [Tue, 18 Jul 2017 21:44:01 +0000 (21:44 +0000)]
Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c  -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 am: 79c476704f am: faded53018
am: 3700014be0

Change-Id: Id7dbefd2586c25730efc719bd787cdf70c98c7f0

7 years agoDO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1...
Phil Weaver [Tue, 18 Jul 2017 21:43:45 +0000 (21:43 +0000)]
DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe  -s ours am: ff115bffb1 am: ccbac7e9e0  -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd  -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db
am: d2c4007d8a

Change-Id: I9c749eb931db880073de06259232f5f03c91cd32

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 ...
Phil Weaver [Tue, 18 Jul 2017 21:40:14 +0000 (21:40 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828  -s ours am: 954deb1c6e am: 37cf6265db  -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f  -s ours am: bbb567757f am: 27ad1fbc2c
am: b2e3fb162f

Change-Id: Ia38cf0592fed9cbf5e83a0163083bcd31d065e7e

7 years agoBack-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5...
Phil Weaver [Tue, 18 Jul 2017 21:27:11 +0000 (21:27 +0000)]
Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c  -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 am: 79c476704f
am: faded53018

Change-Id: I2ba2b1380a91ee398ae65baa8b112bf9c3c3768c

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 ...
Phil Weaver [Tue, 18 Jul 2017 21:27:06 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828  -s ours am: 954deb1c6e am: 37cf6265db  -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f  -s ours am: bbb567757f
am: 27ad1fbc2c

Change-Id: I5830c0f6d5377717e175c1c90360e0487ef37b42

7 years agoDO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1...
Phil Weaver [Tue, 18 Jul 2017 21:24:29 +0000 (21:24 +0000)]
DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe  -s ours am: ff115bffb1 am: ccbac7e9e0  -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd  -s ours am: f44b48acae am: aa8976fa69
am: 783253f6db

Change-Id: Iad10dcb9d92660a20c5db0450da6edd3cc2df329

7 years agoMerge "Back-port fixes for b/62196835" into nyc-dev
Phil Weaver [Tue, 18 Jul 2017 21:23:16 +0000 (21:23 +0000)]
Merge "Back-port fixes for b/62196835" into nyc-dev

7 years agoRemove Tigrinya (ti) from Settings languages
Roozbeh Pournader [Tue, 18 Jul 2017 21:22:40 +0000 (14:22 -0700)]
Remove Tigrinya (ti) from Settings languages

Tigrinya does not have any localized country names for ER (Eritrea)
and ET (Ethiopia), which the user would need to choose if they choose
Tigrinya. Removing from user selectable languages until CLDR/ICU
adds more data.

Change-Id: Iaa7f702db0bb8749a4bdc2e88b03e5ea8590bad9
Fixes: 63807177
Test: Manual (Tigrinya is no longer shown in Settings)

7 years agoBack-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5...
Phil Weaver [Tue, 18 Jul 2017 21:18:42 +0000 (21:18 +0000)]
Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c  -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957
am: 79c476704f

Change-Id: I38051f6f359f780d421384a01ac578f51ca13e63

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 ...
Phil Weaver [Tue, 18 Jul 2017 21:18:16 +0000 (21:18 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828  -s ours am: 954deb1c6e am: 37cf6265db  -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f  -s ours
am: bbb567757f

Change-Id: I7b4397bda68b12219b7494948b8d021fa95f072b

7 years agoDO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1...
Phil Weaver [Tue, 18 Jul 2017 21:14:49 +0000 (21:14 +0000)]
DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe  -s ours am: ff115bffb1 am: ccbac7e9e0  -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd  -s ours am: f44b48acae
am: aa8976fa69

Change-Id: Iff6ad10a9704d09d00c693c074abbb3cd4e49c9e

7 years agoBack-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5...
Phil Weaver [Tue, 18 Jul 2017 21:13:40 +0000 (21:13 +0000)]
Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c  -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e
am: a1dca32957

Change-Id: I5fdeb9f94184dcba41d7e00c129c986d8d1febb9

7 years agoDO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1...
Phil Weaver [Tue, 18 Jul 2017 21:09:40 +0000 (21:09 +0000)]
DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe  -s ours am: ff115bffb1 am: ccbac7e9e0  -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd  -s ours
am: f44b48acae

Change-Id: I855599f5d38735e7356c01e753e67c1dc31f1dad

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 ...
Phil Weaver [Tue, 18 Jul 2017 21:07:43 +0000 (21:07 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828  -s ours am: 954deb1c6e am: 37cf6265db  -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94
am: 7e82d6204f  -s ours

Change-Id: Ieb56ecb0867261e487f92fd5cdf845c99d577d78

7 years agoBack-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5...
Phil Weaver [Tue, 18 Jul 2017 21:07:11 +0000 (21:07 +0000)]
Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c  -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c
am: b968d99e3e

Change-Id: I0ea936af7cd1c217d509fa56367a4260e5dab81a

7 years agoDO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1...
Phil Weaver [Tue, 18 Jul 2017 21:00:36 +0000 (21:00 +0000)]
DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe  -s ours am: ff115bffb1 am: ccbac7e9e0  -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d
am: cf7ce06abd  -s ours

Change-Id: Ibef3aded20e00e9beef1ec189f1a471d978354e2

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 ...
Phil Weaver [Tue, 18 Jul 2017 20:59:54 +0000 (20:59 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828  -s ours am: 954deb1c6e am: 37cf6265db  -s ours am: 5d46833d9c am: 68f7106cf4
am: 5264237c94

Change-Id: I6ca7d132a0df35af8763c3cb7baee375bfb6b178

7 years agoBack-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5...
Phil Weaver [Tue, 18 Jul 2017 20:59:49 +0000 (20:59 +0000)]
Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c  -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89
am: 83261a8b5c

Change-Id: I5fd8c6c844aa52d301fbbbc5dbcf4d5996e0fcf8

7 years agoBack-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5...
Phil Weaver [Tue, 18 Jul 2017 20:55:18 +0000 (20:55 +0000)]
Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c  -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed
am: 62eca82f89

Change-Id: I9a274bfc59f545076adeb2a82cde269457eecc67

7 years agoDO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1...
Phil Weaver [Tue, 18 Jul 2017 20:55:02 +0000 (20:55 +0000)]
DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe  -s ours am: ff115bffb1 am: ccbac7e9e0  -s ours am: 76007bb240 am: 219d9b5dfb
am: f05a6fc52d

Change-Id: I3070db9b698328aa5778fa14825eba526a6a1b33

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 ...
Phil Weaver [Tue, 18 Jul 2017 20:53:07 +0000 (20:53 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828  -s ours am: 954deb1c6e am: 37cf6265db  -s ours am: 5d46833d9c
am: 68f7106cf4

Change-Id: I19110cf28c6fda3fe3f8857bd8590a6a24ade91e

7 years agoBack-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5...
Phil Weaver [Tue, 18 Jul 2017 20:51:15 +0000 (20:51 +0000)]
Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c  -s ours am: 68efc2e5b5 am: e06843fe7e
am: e11e076fed

Change-Id: Ide9b723cf1a31f8fd8b8f5ae848c3cd73c6a12b5

7 years agoDO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1...
Phil Weaver [Tue, 18 Jul 2017 20:46:29 +0000 (20:46 +0000)]
DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe  -s ours am: ff115bffb1 am: ccbac7e9e0  -s ours am: 76007bb240
am: 219d9b5dfb

Change-Id: I1973a5936ceda80873ee03886b64905d46dc6623

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 ...
Phil Weaver [Tue, 18 Jul 2017 20:44:05 +0000 (20:44 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828  -s ours am: 954deb1c6e am: 37cf6265db  -s ours
am: 5d46833d9c

Change-Id: I6b332afcc0e73fb8eddc27585c08da900c4f9ba4

7 years agoBack-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5
Phil Weaver [Tue, 18 Jul 2017 20:44:03 +0000 (20:44 +0000)]
Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c  -s ours am: 68efc2e5b5
am: e06843fe7e

Change-Id: I0faad26b07ab16c7b853b2bbe3eb1304ba70d6f2

7 years agoDO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1...
Phil Weaver [Tue, 18 Jul 2017 20:38:43 +0000 (20:38 +0000)]
DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe  -s ours am: ff115bffb1 am: ccbac7e9e0  -s ours
am: 76007bb240

Change-Id: I143ebc6b57fe5c458e373dad1ac566f5d419aef2

7 years agoBack-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours
Phil Weaver [Tue, 18 Jul 2017 20:35:51 +0000 (20:35 +0000)]
Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c  -s ours
am: 68efc2e5b5

Change-Id: I4bb03e87b259faa45a8a2511d05c340f20fe2a6e

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 ...
Phil Weaver [Tue, 18 Jul 2017 20:30:39 +0000 (20:30 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828  -s ours am: 954deb1c6e
am: 37cf6265db  -s ours

Change-Id: I28f848331e5379736dd777995fe844aa5c5df689

7 years agoDO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1
Phil Weaver [Tue, 18 Jul 2017 20:28:22 +0000 (20:28 +0000)]
DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe  -s ours am: ff115bffb1
am: ccbac7e9e0  -s ours

Change-Id: I28a499e21a6a6d6a4df26317712c09f658383d37

7 years agoBack-port fixes for b/62196835 am: fd0ca151a6
Phil Weaver [Tue, 18 Jul 2017 20:25:44 +0000 (20:25 +0000)]
Back-port fixes for b/62196835 am: fd0ca151a6
am: 3c4d24923c  -s ours

Change-Id: Ie8d7f1d4840bcea7538f99b2eb1bfb2bc472549f

7 years agoMerge "Don't recycle bitmaps we don't own" into oc-dr1-dev
TreeHugger Robot [Tue, 18 Jul 2017 20:08:58 +0000 (20:08 +0000)]
Merge "Don't recycle bitmaps we don't own" into oc-dr1-dev

7 years agoMerge "Add home activity methods to wrapper." into oc-dr1-dev
Daniel Nishi [Tue, 18 Jul 2017 19:34:42 +0000 (19:34 +0000)]
Merge "Add home activity methods to wrapper." into oc-dr1-dev

7 years agoMerge "Fix rotation animation selection." into oc-dr1-dev
Rob Carr [Tue, 18 Jul 2017 19:31:00 +0000 (19:31 +0000)]
Merge "Fix rotation animation selection." into oc-dr1-dev

7 years agoMerge "Do not register for broadcasts within NoMan test." into oc-dr1-dev
Geoffrey Pitsch [Tue, 18 Jul 2017 19:30:28 +0000 (19:30 +0000)]
Merge "Do not register for broadcasts within NoMan test." into oc-dr1-dev

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 ...
Phil Weaver [Tue, 18 Jul 2017 18:41:22 +0000 (18:41 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828  -s ours
am: 954deb1c6e

Change-Id: I929c9dfa84b25fdbeadfedf0e0e9ecd914a74483

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev
Phil Weaver [Tue, 18 Jul 2017 18:36:23 +0000 (18:36 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev
am: a620b21828  -s ours

Change-Id: Iaa4e8eb83ebf2036999a31e3487c6157bcefecbf

7 years agoDO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours
Phil Weaver [Tue, 18 Jul 2017 18:36:21 +0000 (18:36 +0000)]
DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe  -s ours
am: ff115bffb1

Change-Id: Ieca157f60b7c57f60900b55b10fcf8e585852e70

7 years agoBack-port fixes for b/62196835
Phil Weaver [Tue, 18 Jul 2017 18:26:58 +0000 (18:26 +0000)]
Back-port fixes for b/62196835
am: fd0ca151a6

Change-Id: I442d26b476e3e83602b5f2eb61a01386e4d6d247

7 years agoDO NOT MERGE Back-port fixes for b/62196835
Phil Weaver [Tue, 18 Jul 2017 18:26:57 +0000 (18:26 +0000)]
DO NOT MERGE Back-port fixes for b/62196835
am: 24fdc53cfe  -s ours

Change-Id: I01a6f574df5cc1b133b7f761062a6259aac07476

7 years agoMerge "Renamed attribute with abbreviated name" into oc-dr1-dev
TreeHugger Robot [Tue, 18 Jul 2017 18:23:55 +0000 (18:23 +0000)]
Merge "Renamed attribute with abbreviated name" into oc-dr1-dev

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev
Phil Weaver [Tue, 18 Jul 2017 18:19:45 +0000 (18:19 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev

7 years agoBack-port fixes for b/62196835
Phil Weaver [Wed, 12 Jul 2017 21:04:16 +0000 (14:04 -0700)]
Back-port fixes for b/62196835

Bug: 62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.

Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0

7 years agoMerge "Ensure home activity always is on home stack." into oc-dr1-dev
Bryce Lee [Tue, 18 Jul 2017 16:59:10 +0000 (16:59 +0000)]
Merge "Ensure home activity always is on home stack." into oc-dr1-dev

7 years agoDo not register for broadcasts within NoMan test.
Geoffrey Pitsch [Tue, 18 Jul 2017 14:35:22 +0000 (10:35 -0400)]
Do not register for broadcasts within NoMan test.

Fixes potential flake when broadcasts come in after Looper has
terminated.

Change-Id: Id63d27970b1ffacccfa8f1b074f744b6547ffcf9
Fixes: 63797731
Test: runtest systemui-notification

7 years agoMerge "Delay marquee scrolling on lockscreen by 2 seconds." into oc-dr1-dev
TreeHugger Robot [Tue, 18 Jul 2017 10:24:17 +0000 (10:24 +0000)]
Merge "Delay marquee scrolling on lockscreen by 2 seconds." into oc-dr1-dev

7 years agoFix rotation animation selection.
Robert Carr [Tue, 18 Jul 2017 01:37:06 +0000 (18:37 -0700)]
Fix rotation animation selection.

The default manifest value needs to be unspecified, not rotate,
as rotate overrides the LayoutParams specified value.

Bug: 63151981
Test: Manual from bug. go/wm-smoke.
Change-Id: I2ad6e3fdd06eeef0166bbe09d07b57cc45ed6e50

7 years agoRenamed attribute with abbreviated name
Lucas Dupin [Tue, 18 Jul 2017 00:25:20 +0000 (17:25 -0700)]
Renamed attribute with abbreviated name

Renamed attribute as part of refactoring overlays.

Bug: 63751714
Test: make
Change-Id: Ia75fbf6c1dbcbd530d6b03a239b61b61719da8e0

7 years agoMerge "Fix typo in sync log." into oc-dr1-dev
TreeHugger Robot [Tue, 18 Jul 2017 00:07:16 +0000 (00:07 +0000)]
Merge "Fix typo in sync log." into oc-dr1-dev

7 years agoMerge "Fix issue with configuration update check." into oc-dr1-dev
TreeHugger Robot [Mon, 17 Jul 2017 23:30:22 +0000 (23:30 +0000)]
Merge "Fix issue with configuration update check." into oc-dr1-dev

7 years agoMerge "power: throttle interaction hints" into oc-dr1-dev
Tim Murray [Mon, 17 Jul 2017 23:16:41 +0000 (23:16 +0000)]
Merge "power: throttle interaction hints" into oc-dr1-dev

7 years agoMerge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev
Benjamin Miller [Mon, 17 Jul 2017 22:37:35 +0000 (22:37 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev
am: d726ff988c

Change-Id: I42a62feffca60e8beb75e991ea0b6545a2813233

7 years agoMerge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev
TreeHugger Robot [Mon, 17 Jul 2017 22:28:09 +0000 (22:28 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev

7 years agoAdd home activity methods to wrapper.
Daniel Nishi [Wed, 12 Jul 2017 17:24:25 +0000 (10:24 -0700)]
Add home activity methods to wrapper.

This allows us to properly use it in Robolectric tests.

Bug: 63154615
Test: Used in Settings unit test

Change-Id: I9f55529449313003a5ed10a997e21591ceae43cb

7 years agoEnsure home activity always is on home stack.
Bryce Lee [Mon, 17 Jul 2017 17:39:24 +0000 (10:39 -0700)]
Ensure home activity always is on home stack.

It is possible to start a home activity on a non-home stack. For
example, an activity that handles the home intent may be started with
via a different intent, landing it on the fullscreen stack. This
becomes problematic later on due to our assumptions about the home
stack state and handling of tasks within it.

To ensure proper behavior, this changelist moves the activity
handling the home intent to the home stack if it is not already
present there.

Fixes: 36606833
Test: Move home activity to fullscreen stack, launch another
      activity, press home button.
Test: go/wm-smoke

Change-Id: If88550a24dca3eabc0c60940937e6a1e6f133cae

7 years agopower: throttle interaction hints
Tim Murray [Fri, 14 Jul 2017 20:54:37 +0000 (13:54 -0700)]
power: throttle interaction hints

Don't send power HAL interaction hints more than every 100ms. Also can send userActivity
calls every 100ms too (down from 500ms).

Test: power HAL doesn't run every 8ms
bug 63632697

Change-Id: Ic986f6fc51e58f8060f7bf2d2ac61a9906be5c1f

7 years agoFix issue with configuration update check.
Winson Chung [Mon, 17 Jul 2017 18:35:39 +0000 (11:35 -0700)]
Fix issue with configuration update check.

- We can hold a reference to the same configuration since it is updated
  and re-dispatched. Instead, make a copy of the configuration to store
  the last configuration state.

Fixes: 63755686
Test: Open Recents, rotate, ensure that the display bounds and task bounds
      are calculated correctly.

Change-Id: Ie0d2b5a0fa479428614d9593a2379420ccbd2fb4

7 years agoDocs-change: clarification of LauncherApps.getApplicationInfo()
Benjamin Miller [Mon, 17 Jul 2017 11:01:35 +0000 (13:01 +0200)]
Docs-change: clarification of LauncherApps.getApplicationInfo()

Staged at: go/dac-stage/reference/android/content/pm/LauncherApps.html#getApplicationInfo(java.lang.String, int, android.os.UserHandle)

Test: make ds-docs and output staged
Bug: 38024981
Change-Id: I9f256d675433457b7c85fa111ed87d1147f1f2bc

7 years agoMerge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev
Geoffrey Pitsch [Mon, 17 Jul 2017 17:31:26 +0000 (17:31 +0000)]
Merge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev

7 years agoDisable lock screen by default for demo users
Christine Franks [Sat, 24 Jun 2017 01:12:46 +0000 (18:12 -0700)]
Disable lock screen by default for demo users

Bug: 62712426
Test: frameworks/base/core/tests/utiltests/runtests.sh \
-e class com.android.internal.util.LockPatternUtilsTest
Change-Id: Ic2e00a2a73f160c27e4059f32e5a1d18ebc298a5

7 years agoDon't recycle bitmaps we don't own
Lucas Dupin [Thu, 13 Jul 2017 23:32:44 +0000 (16:32 -0700)]
Don't recycle bitmaps we don't own

WallpaperColors#fromBitmap should only recycle the bitmaps
created by itself.

Test: runtest -x tests/Internal/src/android/app/WallpaperColorsTest.java
Fixes: 63758291
Change-Id: I1710bf7118b6ae871442f9606f95ac9c9dbb7d24

7 years agoMerge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev
TreeHugger Robot [Mon, 17 Jul 2017 16:14:44 +0000 (16:14 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev

7 years agoMerge "Added check for AOD before showing volume dialog." into oc-dr1-dev
TreeHugger Robot [Mon, 17 Jul 2017 15:59:04 +0000 (15:59 +0000)]
Merge "Added check for AOD before showing volume dialog." into oc-dr1-dev

7 years agoDelay marquee scrolling on lockscreen by 2 seconds.
Geoffrey Pitsch [Fri, 14 Jul 2017 13:55:16 +0000 (09:55 -0400)]
Delay marquee scrolling on lockscreen by 2 seconds.

Starting too quickly makes it hard to see the beginning.

Test: manual
Change-Id: I203a65856c27f9e23f2e091669ac7b0ae1c114d9
Fixes: 21976443

7 years agoRemove Keyguard owner info from RelativeLayout.
Geoffrey Pitsch [Mon, 17 Jul 2017 13:31:55 +0000 (09:31 -0400)]
Remove Keyguard owner info from RelativeLayout.

Altering other elements in the layout was forcing unnecessary
changes on the marquee scrolling.

Fixes: 62400546
Test: manual
Change-Id: Ib9cccb91b6a95e614917eacfddb91624aea3ba27

7 years agoMerge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
Benjamin Miller [Mon, 17 Jul 2017 14:23:25 +0000 (14:23 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
am: ca007e525b

Change-Id: If2a06d8e8e5fe2034e22c86dabf68bf7d3f79bb0

7 years agoMerge "Improved GNSS state debug logs" into oc-dr1-dev
TreeHugger Robot [Mon, 17 Jul 2017 14:21:01 +0000 (14:21 +0000)]
Merge "Improved GNSS state debug logs" into oc-dr1-dev

7 years agoMerge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
TreeHugger Robot [Mon, 17 Jul 2017 14:11:55 +0000 (14:11 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev

7 years agoEnforce policy for camera gesture in keyguard
Esteban Talavera [Fri, 14 Jul 2017 15:14:07 +0000 (16:14 +0100)]
Enforce policy for camera gesture in keyguard

If the admin has disabled the camera for secure
keyguards, in addition to removing the bottom-right hand
corner camera button do not allow the camera to be opened
via the camera gesture either.

Bug: 63334090
Test: Manually tested launching the camera on secure and non-secure keyguard and non-keyguard, both via camera icon and gesture
Change-Id: I104688eaad719528376e2851f837d5956a6a1169

7 years agoAdded check for AOD before showing volume dialog.
Beverly [Wed, 12 Jul 2017 14:58:22 +0000 (10:58 -0400)]
Added check for AOD before showing volume dialog.

Fixes: 62598406

Test: runtest systemui

Change-Id: I407eed0e0559ef0bc61d36ad9c5e84c6924c161e

7 years agoMerge "Use new powerHintAsync when available" into oc-dr1-dev
TreeHugger Robot [Sun, 16 Jul 2017 22:45:29 +0000 (22:45 +0000)]
Merge "Use new powerHintAsync when available" into oc-dr1-dev

7 years agoMerge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev
Lorenzo Colitti [Sun, 16 Jul 2017 07:38:12 +0000 (07:38 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev

7 years agoMerge "Make failure to set addrgenmode a non-fatal error." into oc-dr1-dev
Lorenzo Colitti [Sat, 15 Jul 2017 19:38:00 +0000 (19:38 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error." into oc-dr1-dev

7 years agoCaptivePortalLogin ignores some ssl errors.
Hugo Benichi [Sat, 17 Jun 2017 04:36:35 +0000 (13:36 +0900)]
CaptivePortalLogin ignores some ssl errors.

This patch changes the ssl error handler of the captive portal login
activity to ignore errors for resources coming from a different hostname
that the top-level page currently loading.

This allows logging into misconfigured portals that incorrectly bans ssl
to some hostnames necessary for loading their portal login pages.

Bug: 62332137
Test: manually tested with captive portal entwork.

(cherry pick from commit 22542ed48090e2e6e9474b658fdd368041a4060b which
was skipped from merging into oc-dr1-dev-plus-aosp because of previous
cherry picks and incorrect Merged-In annotations)

Change-Id: Idb6ffac2d97b15cfdbe524b91c84dd29ae0be00b
Merged-In: Idb6ffac2d97b15cfdbe524b91c84dd29ae0be00b

7 years agoMerge "Load internal resources using name rather than ID" into oc-dr1-dev
TreeHugger Robot [Sat, 15 Jul 2017 14:53:44 +0000 (14:53 +0000)]
Merge "Load internal resources using name rather than ID" into oc-dr1-dev

7 years agoMerge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
Peng Xu [Fri, 14 Jul 2017 23:07:11 +0000 (23:07 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
am: 17e641dae5

Change-Id: I4391dafa9d153213e35ac58bceb8d2f4c958fde0

7 years agoMerge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
TreeHugger Robot [Fri, 14 Jul 2017 22:55:15 +0000 (22:55 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev

7 years agoMerge "Take a wrench to the pipes" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 21:33:51 +0000 (21:33 +0000)]
Merge "Take a wrench to the pipes" into oc-dr1-dev

7 years agoMerge "Fix mobile signal colors to match wifi et al" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 21:16:44 +0000 (21:16 +0000)]
Merge "Fix mobile signal colors to match wifi et al" into oc-dr1-dev

7 years agoMerge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev
Wei Wang [Fri, 14 Jul 2017 20:42:23 +0000 (20:42 +0000)]
Merge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev

7 years agoMerge "Move palette constants to XML" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 20:24:37 +0000 (20:24 +0000)]
Merge "Move palette constants to XML" into oc-dr1-dev

7 years agoUse new powerHintAsync when available
Philip Cuadra [Wed, 12 Jul 2017 00:01:06 +0000 (17:01 -0700)]
Use new powerHintAsync when available

Use the async version of powerHint when available.

Bug: 62377008
Test: Run systrace, confirm powerHints are async HIDL transactions
Change-Id: I3bb4022b78d380b054bf13008bb8b0d399bf1955
Merged-In: I3bb4022b78d380b054bf13008bb8b0d399bf1955

7 years agoMerge "Temporarily disable eUICC factory reset handling." into oc-dr1-dev
Jeff Davidson [Fri, 14 Jul 2017 19:54:52 +0000 (19:54 +0000)]
Merge "Temporarily disable eUICC factory reset handling." into oc-dr1-dev

7 years agoMerge "Round mobile icon slash and fix color" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 19:49:00 +0000 (19:49 +0000)]
Merge "Round mobile icon slash and fix color" into oc-dr1-dev

7 years agoMerge "Preload app-process HALs in Zygote" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 19:33:26 +0000 (19:33 +0000)]
Merge "Preload app-process HALs in Zygote" into oc-dr1-dev

7 years agoMerge "Fix crash in monodroid apps" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 19:26:43 +0000 (19:26 +0000)]
Merge "Fix crash in monodroid apps" into oc-dr1-dev

7 years agoSystemServiceManager: Change from wall time to boottiime
Wei Wang [Fri, 14 Jul 2017 18:39:30 +0000 (11:39 -0700)]
SystemServiceManager: Change from wall time to boottiime

elapsedRealtime is milliseconds since boot, including time spent in sleep

Bug: 63707383
Test: Build
Change-Id: I7db77565f2af6277f05400398044fad297872ea4