OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "screencap: always exit with _exit()." into oc-dr1-dev
Martijn Coenen [Mon, 7 Aug 2017 11:01:14 +0000 (11:01 +0000)]
Merge "screencap: always exit with _exit()." into oc-dr1-dev
am: 4499576db0  -s ours

Change-Id: I6119b3e45a4b104aa9a7cbad576a6b3d8a273ca4

6 years agoMerge "screencap: always exit with _exit()." into oc-dr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 10:54:02 +0000 (10:54 +0000)]
Merge "screencap: always exit with _exit()." into oc-dr1-dev

6 years agoMerge "Avoid entering orientation changing state when seamlessly rotating." into...
Robert Carr [Mon, 7 Aug 2017 10:49:05 +0000 (10:49 +0000)]
Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev
am: 17844f2257

Change-Id: Ic1d7779f66958961da22230187f71310d9fedec8

6 years agoMerge "Avoid entering orientation changing state when seamlessly rotating." into...
TreeHugger Robot [Mon, 7 Aug 2017 10:44:18 +0000 (10:44 +0000)]
Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 06:01:02 +0000 (06:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev
Hugo Benichi [Mon, 7 Aug 2017 05:49:25 +0000 (05:49 +0000)]
Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev
am: 1b3877a965

Change-Id: I50748aa0c9332787797f91265afccf82ceabf332

6 years agoMerge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev
Hugo Benichi [Mon, 7 Aug 2017 05:42:48 +0000 (05:42 +0000)]
Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev

6 years agoMerge "Adding strings to support warning about emergency calls." into oc-mr1-dev
Pankaj Kanwar [Sun, 6 Aug 2017 18:58:41 +0000 (18:58 +0000)]
Merge "Adding strings to support warning about emergency calls." into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 17:26:43 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:36:37 +0000 (16:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:34:54 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Fix broken javadocs." into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:28:58 +0000 (16:28 +0000)]
Merge "Fix broken javadocs." into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:23:59 +0000 (16:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:22:25 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:20:54 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:19:51 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:19:05 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:15:03 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:13:56 +0000 (16:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:05:04 +0000 (16:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 15:57:07 +0000 (15:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 14:52:48 +0000 (14:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoFix broken javadocs.
Jeff Sharkey [Sat, 5 Aug 2017 19:49:13 +0000 (13:49 -0600)]
Fix broken javadocs.

Bug: 64337634
Test: make -j32 doc-comment-check-docs
Change-Id: I20fdd3dcddef09111d35946c41c596c7689effa6

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 10:16:09 +0000 (03:16 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia0c7b2cac613780c802ac645226d33ad031d768a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 10:09:38 +0000 (03:09 -0700)]
Import translations. DO NOT MERGE

Change-Id: I10155c355d302c88ef1e99d7dc64da171be90840
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 08:47:13 +0000 (01:47 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3e617e1a004e45b485658d496e09cd4c732415cc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 08:40:32 +0000 (01:40 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia3d470f1ae6cc63bb3cc9d58b896eaf57075e0a4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 08:35:38 +0000 (01:35 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iea4f3f8198348c4ac06675dc9881d13d09528b39
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 08:30:50 +0000 (01:30 -0700)]
Import translations. DO NOT MERGE

Change-Id: I962af978bb234c98434ec32b7cca97bdedb2e7f4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 08:26:03 +0000 (01:26 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic952913a31c1683c0a6ea7c14763721c529ce26d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 08:21:24 +0000 (01:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib2668121a28d316552691d7f72da05a5a3c78321
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 08:14:54 +0000 (01:14 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iec1e8c2c5c13484ffc915fcaa874d5cc43c1a66c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 08:09:59 +0000 (01:09 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5ed3fe6e64b2ac5bec9e451e9e1797e6bea8031b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 08:05:08 +0000 (01:05 -0700)]
Import translations. DO NOT MERGE

Change-Id: If79c2f71715afe6a11a91a8e3e94fb9184f3a21f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 08:00:22 +0000 (01:00 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iab686e68cda9fac3b18a8fb38fe766d9583ebf68
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 07:54:17 +0000 (00:54 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie00477d775338c307f23550d2bdc99f0933246e8
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 01:43:53 +0000 (18:43 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie34e4b0e1787d5772c175be2c0de14a6de527003
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 01:33:48 +0000 (18:33 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib2fd9bee8040fa4c57a62cbf22a64361201ab7cd
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoMerge "rename notification channel" into oc-mr1-dev
Chen Xu [Sat, 5 Aug 2017 22:54:29 +0000 (22:54 +0000)]
Merge "rename notification channel" into oc-mr1-dev

6 years agoMerge "Pass ProgramInfo over currentProgramInfoChanged and drop afSwitch_1_1." into...
Tomasz Wasilczyk [Sat, 5 Aug 2017 20:47:14 +0000 (20:47 +0000)]
Merge "Pass ProgramInfo over currentProgramInfoChanged and drop afSwitch_1_1." into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 5 Aug 2017 13:42:53 +0000 (13:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: f6d5426433  -s ours

Change-Id: Ie9c97e96908f2552ec64910eac8dd3d8aff45500

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 5 Aug 2017 13:40:53 +0000 (13:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 5e4a4d76e1  -s ours

Change-Id: I6b5cbb464105136e6cdaacd6a971232dfb837edd

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 5 Aug 2017 13:38:52 +0000 (13:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 08815ac99f  -s ours

Change-Id: I18be08851853ec4eefd1f209d9452f4412ed6584

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 5 Aug 2017 13:36:11 +0000 (13:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: f9e03da0b9  -s ours

Change-Id: Ibfc11d3ad1c6a5892ada761cab957f65467e511c

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:31:00 +0000 (13:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:29:59 +0000 (13:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:24:06 +0000 (13:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 5 Aug 2017 13:23:54 +0000 (13:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: e1a6bf5b74  -s ours

Change-Id: I28e2efcb3dc5df76d5e2eca6d7e6a6d9456fb4f4

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 5 Aug 2017 13:21:34 +0000 (13:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: c1d8698655  -s ours

Change-Id: I3da41a256cfd003197e3e56454716e16b424afa7

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:18:41 +0000 (13:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 5 Aug 2017 13:16:03 +0000 (13:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 6153572baa  -s ours

Change-Id: I41025fc3f9186b33838ebe56c678ed6b229330ca

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:11:13 +0000 (13:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:10:07 +0000 (13:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:05:45 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 5 Aug 2017 09:17:44 +0000 (02:17 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6127e525c2824a2c947728ef94251082fd5bec14
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 5 Aug 2017 09:13:14 +0000 (02:13 -0700)]
Import translations. DO NOT MERGE

Change-Id: I4e89d6ac0b96852fae1e1c8a030ffd8c5e003171
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 5 Aug 2017 07:56:19 +0000 (00:56 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib197bb63c3fbcef8ffc69275998deb040203f1cb
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 5 Aug 2017 07:35:11 +0000 (00:35 -0700)]
Import translations. DO NOT MERGE

Change-Id: If4c521d07e05c2602b15d5d7752d84a57507ad92
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 5 Aug 2017 07:30:33 +0000 (00:30 -0700)]
Import translations. DO NOT MERGE

Change-Id: I53239157d82bf33503972713fe1657e2295aa526
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 5 Aug 2017 07:20:52 +0000 (00:20 -0700)]
Import translations. DO NOT MERGE

Change-Id: If65ca28adeee2b1ae467f2e8d780e4f597a3e81e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 5 Aug 2017 07:16:15 +0000 (00:16 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id0b1ae5fd74159dd5d84b61f1c5f6470de295053
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 5 Aug 2017 02:45:07 +0000 (02:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: bce71a114d  -s ours

Change-Id: I0ebc240ea29f0f4d97ea1c39de035654bc46b0db

6 years agoNetworkCapabilities: fix describeImmutableDifferences
Hugo Benichi [Fri, 4 Aug 2017 04:18:40 +0000 (13:18 +0900)]
NetworkCapabilities: fix describeImmutableDifferences

This patch fixes the mask used in describeImmutableDifferences which did
not correctly turn NET_CAPABILITY_NOT_METERED into bit flag.

Bug: 63326103
Test: added unit tests, runtest frameworks-net
Merged-In: Ib6b390b1daef5912859302692af7dcd6cfd3e39a
Merged-In: If38efacdeec8476880835657938e435f9b598525
Merged-In: Ieccad46fcffcaf748f5644b04617e9a82527000e
Merged-In: I533ef8fe369cec19d283ff2950314fce6e28cffd
Merged-In: I12636c6699ff60487a28570208e819ea0b66fa2e
Merged-In: Ie5df14e0ea1c12e0cfabe87978ac6c9b744353b2

(cherry picked from commit 2ecb9408f4102687f20f9ca19c13071ac6098cc6)

Change-Id: I74ecf34a2c079c74152d00caea2c220e9c6d1fa5

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 02:35:46 +0000 (02:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoMerge "Fix activity start over Keyguard" into oc-dr1-dev
Selim Cinek [Fri, 4 Aug 2017 23:53:32 +0000 (23:53 +0000)]
Merge "Fix activity start over Keyguard" into oc-dr1-dev
am: 82e815616e

Change-Id: Ic7750a2f8d0183b350e3a9ec5541f38df613fe63

6 years agoMerge "Fix activity start over Keyguard" into oc-dr1-dev
Selim Cinek [Fri, 4 Aug 2017 23:41:07 +0000 (23:41 +0000)]
Merge "Fix activity start over Keyguard" into oc-dr1-dev

6 years agoAdding strings to support warning about emergency calls.
pkanwar [Fri, 4 Aug 2017 23:01:23 +0000 (16:01 -0700)]
Adding strings to support warning about emergency calls.

Bug: 62618428
Test: compiles
Change-Id: I5cee8b5ebc39e4247eeff0b3e17cac3cea983894

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 4 Aug 2017 23:14:49 +0000 (16:14 -0700)]
Import translations. DO NOT MERGE

Change-Id: I11e8908001cbf5e33e280ca2c8fb3b30c686f3f2
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agorename notification channel
fionaxu [Fri, 4 Aug 2017 22:44:03 +0000 (15:44 -0700)]
rename notification channel

rename the channel mobile_data_alert to mobile_data_status

Bug: 64367389
Test: Manual
Change-Id: I16d3ccfe85c879ff4bd4364d244c1b62cf616092

6 years agoMerge "AOD: Fix navbar flicker when launching assistant" into oc-dr1-dev
Adrian Roos [Fri, 4 Aug 2017 22:52:19 +0000 (22:52 +0000)]
Merge "AOD: Fix navbar flicker when launching assistant" into oc-dr1-dev
am: bd27fd7368

Change-Id: Ieb33f859cb1c190a23f08bd68b77c049ca9719b2

6 years agoMerge "AOD: Fix navbar flicker when launching assistant" into oc-dr1-dev
Adrian Roos [Fri, 4 Aug 2017 22:41:23 +0000 (22:41 +0000)]
Merge "AOD: Fix navbar flicker when launching assistant" into oc-dr1-dev

6 years agoPass ProgramInfo over currentProgramInfoChanged and drop afSwitch_1_1.
Tomasz Wasilczyk [Fri, 4 Aug 2017 01:10:45 +0000 (18:10 -0700)]
Pass ProgramInfo over currentProgramInfoChanged and drop afSwitch_1_1.

Bug: b/64229617
Test: instrumentation
Change-Id: Ib4b20a6ebdd05a51f1a30447ccc3c2357df2a35d

6 years agoMerge "Pass vendor-specific info as map." into oc-mr1-dev
Tomasz Wasilczyk [Fri, 4 Aug 2017 21:12:21 +0000 (21:12 +0000)]
Merge "Pass vendor-specific info as map." into oc-mr1-dev

6 years agoMerge "Fix race condition / test flakiness." into oc-dr1-dev
Sundeep Ghuman [Fri, 4 Aug 2017 21:08:43 +0000 (21:08 +0000)]
Merge "Fix race condition / test flakiness." into oc-dr1-dev
am: 0c8e5b6dda

Change-Id: I0e7541f39696e226baf68418ea86ed94cea34827

6 years agoMerge "Fix race condition / test flakiness." into oc-dr1-dev
TreeHugger Robot [Fri, 4 Aug 2017 20:59:34 +0000 (20:59 +0000)]
Merge "Fix race condition / test flakiness." into oc-dr1-dev

6 years agoMerge "Only allow one turnScreenOn per app resume." into oc-dr1-dev
Chavi Weingarten [Fri, 4 Aug 2017 20:40:13 +0000 (20:40 +0000)]
Merge "Only allow one turnScreenOn per app resume." into oc-dr1-dev
am: c36b2f0490

Change-Id: Ica77a650a769c282f97056b0779def22ee0d00e1

6 years agoMerge "Only allow one turnScreenOn per app resume." into oc-dr1-dev
Chavi Weingarten [Fri, 4 Aug 2017 20:30:57 +0000 (20:30 +0000)]
Merge "Only allow one turnScreenOn per app resume." into oc-dr1-dev

6 years agoMerge "New keyguard icons" into oc-dr1-dev
Lucas Dupin [Fri, 4 Aug 2017 20:27:41 +0000 (20:27 +0000)]
Merge "New keyguard icons" into oc-dr1-dev
am: 6df24d2f42

Change-Id: Ia77834f46449f18f02aa9d6d17a3d2141087515f

6 years agoMerge "New keyguard icons" into oc-dr1-dev
TreeHugger Robot [Fri, 4 Aug 2017 20:14:52 +0000 (20:14 +0000)]
Merge "New keyguard icons" into oc-dr1-dev

6 years agoMerge "Fixed that the screen could lock when launching camera" into oc-dr1-dev
Selim Cinek [Fri, 4 Aug 2017 19:59:54 +0000 (19:59 +0000)]
Merge "Fixed that the screen could lock when launching camera" into oc-dr1-dev
am: fb52158e85

Change-Id: I3e4abb55f30663ce7953c324ce8ad5220ed9a1c3

6 years agoMerge "Fixed that the screen could lock when launching camera" into oc-dr1-dev
Selim Cinek [Fri, 4 Aug 2017 19:41:06 +0000 (19:41 +0000)]
Merge "Fixed that the screen could lock when launching camera" into oc-dr1-dev

6 years agoOnly allow one turnScreenOn per app resume.
chaviw [Wed, 2 Aug 2017 00:24:59 +0000 (17:24 -0700)]
Only allow one turnScreenOn per app resume.

The current behavior will turn the screen on if a relayout is
called. This is problematic because if the screen is off but the
client is still requesting relayouts, the relayout will trigger
a request to turn the screen on. This change ensures that the screen
will only get turned on at most once per resume. If the activity
is relaunched again, the screen can be turned on again.

Fixes: 64139966
Test: go/wm-smoke
Test: Added cts test ActivityManagerActivityVisibilityTests#testTurnScreenOnActivity_WithRelayout
Test: Set the phone to have always on ambient display. Launched the
dialer app and turned the screen off. The screen no longer turns back
on automatically.

Change-Id: I5f6ac5451683d4488e72e3a6377cb3a6fd6504b2

6 years agoMerge "Make NearestTouchFrameTest run on more device configurations" into oc-dr1-dev
Jason Monk [Fri, 4 Aug 2017 17:38:34 +0000 (17:38 +0000)]
Merge "Make NearestTouchFrameTest run on more device configurations" into oc-dr1-dev
am: a083c8f83a

Change-Id: I472011ba027b2d6b363807cee098e6114c231d38

6 years agoMerge "Make NearestTouchFrameTest run on more device configurations" into oc-dr1-dev
TreeHugger Robot [Fri, 4 Aug 2017 17:26:55 +0000 (17:26 +0000)]
Merge "Make NearestTouchFrameTest run on more device configurations" into oc-dr1-dev

6 years agoMake NearestTouchFrameTest run on more device configurations
Jason Monk [Fri, 4 Aug 2017 14:59:13 +0000 (10:59 -0400)]
Make NearestTouchFrameTest run on more device configurations

Test: runtest systemui
Change-Id: Ied095c1e884d1ca95531e2f4e182f1d1bcaaeb35
Fixes: 64339927

6 years agoMerge "AsyncSensorManager: Fix unregistration bug" into oc-dr1-dev
Adrian Roos [Fri, 4 Aug 2017 14:13:47 +0000 (14:13 +0000)]
Merge "AsyncSensorManager: Fix unregistration bug" into oc-dr1-dev
am: 6583c37a1b

Change-Id: I6c5fd9d65202fd9b7f2c784d84e5b2dbbff7b6d2

6 years agoMerge "AsyncSensorManager: Fix unregistration bug" into oc-dr1-dev
Adrian Roos [Fri, 4 Aug 2017 13:59:33 +0000 (13:59 +0000)]
Merge "AsyncSensorManager: Fix unregistration bug" into oc-dr1-dev

6 years agoMerge "Revert opacity changes from (Id94a5684b2c55956b01aa6cfb240784e6bab2f6e)" into...
Evan Laird [Fri, 4 Aug 2017 13:49:10 +0000 (13:49 +0000)]
Merge "Revert opacity changes from (Id94a5684b2c55956b01aa6cfb240784e6bab2f6e)" into oc-dr1-dev
am: d17d52567b

Change-Id: I327a0e9f91bd8eac756a65ba6e68304c3934abfc

6 years agoAOD: Fix navbar flicker when launching assistant
Adrian Roos [Fri, 4 Aug 2017 13:04:43 +0000 (15:04 +0200)]
AOD: Fix navbar flicker when launching assistant

When reset() gets called during unocclusion, we were hiding the
keyguard even though it is still needed while dozing; instead,
reset is now actually called after dozing finishes.

Test: Trigger assistant from AOD; verify navigation bar buttons do not show
Fixes: 64164106
Change-Id: Ic29cf40ade7d3cd492723a3f859f8a7734edad93

6 years agoMerge "Revert opacity changes from (Id94a5684b2c55956b01aa6cfb240784e6bab2f6e)" into...
Evan Laird [Fri, 4 Aug 2017 13:40:08 +0000 (13:40 +0000)]
Merge "Revert opacity changes from (Id94a5684b2c55956b01aa6cfb240784e6bab2f6e)" into oc-dr1-dev

6 years agoMerge changes I901908d9,Iac9835ad into oc-dr1-dev
Adrian Roos [Fri, 4 Aug 2017 13:31:17 +0000 (13:31 +0000)]
Merge changes I901908d9,Iac9835ad into oc-dr1-dev
am: 47aac56746

Change-Id: I6e90dd7720b41c22bd7f87114e3854d028be0346

6 years agoMerge changes I901908d9,Iac9835ad into oc-dr1-dev
Adrian Roos [Fri, 4 Aug 2017 13:20:02 +0000 (13:20 +0000)]
Merge changes I901908d9,Iac9835ad into oc-dr1-dev

* changes:
  AOD: Fix RemoteInput from dozing
  AOD: Fix janky launch transition from AOD2

6 years agoMerge "AutoSize TextView - fix transformation method" into oc-mr1-dev
Andrei Stingaceanu [Fri, 4 Aug 2017 13:08:40 +0000 (13:08 +0000)]
Merge "AutoSize TextView - fix transformation method" into oc-mr1-dev

6 years agoFix activity start over Keyguard
Jorim Jaggi [Fri, 4 Aug 2017 12:29:16 +0000 (14:29 +0200)]
Fix activity start over Keyguard

Starting an activity over Keyguard was stuck in initializing
state because activtiy isn't visible yet. Instead, use
visibleIgnoringKeyguard to determine which activities to start

Test: KeyguardTests, KeyguardLockedTests,
Test: go/wm-smoke
Change-Id: I7dce1f2f1a2830012d2372db7e8655803251188d
Fixes: 64351094

6 years agoMerge "Never consider windows visible if appToken is hidden" into oc-dr1-dev
Jorim Jaggi [Fri, 4 Aug 2017 12:16:15 +0000 (12:16 +0000)]
Merge "Never consider windows visible if appToken is hidden" into oc-dr1-dev
am: 8e9984ee83

Change-Id: I3e2e2e639564c9fc0db9982c24229c82a93eed82

6 years agoMerge "Never consider windows visible if appToken is hidden" into oc-dr1-dev
Jorim Jaggi [Fri, 4 Aug 2017 12:07:11 +0000 (12:07 +0000)]
Merge "Never consider windows visible if appToken is hidden" into oc-dr1-dev

6 years agoRevert "Don't remove starting window for visible app."
Jorim Jaggi [Fri, 4 Aug 2017 11:44:30 +0000 (11:44 +0000)]
Revert "Don't remove starting window for visible app."
am: 19be605910

Change-Id: I03ea07976bfff041bcc6d39a9589b2f0236a118d

6 years agoRevert "Don't remove starting window for visible app."
Jorim Jaggi [Thu, 3 Aug 2017 16:33:43 +0000 (18:33 +0200)]
Revert "Don't remove starting window for visible app."

This reverts commit 2c596d57535a1d8c327457931dfc835608b677a4.

Reason: Causes starting window leaks

Test: Open 9gag, click home immediately again
Test: go/wm-smoke
Change-Id: I136cbcf66b680c782ab0e039c383e8d189a0b6e3
Fixes: 64154208
Bug: 62443388

6 years agoAsyncSensorManager: Fix unregistration bug
Adrian Roos [Fri, 4 Aug 2017 10:35:24 +0000 (12:35 +0200)]
AsyncSensorManager: Fix unregistration bug

Fixes an issue where unregistering a listener without specifying a sensor did
not work correctly; when passing null as the sensor, SensorManager.unregisterListener
silently ignores the call; instead, we now call the proper variant if given a null
sensor.

Change-Id: Iac362d8d6ae966308578cb4f177bd37af10b81a2
Fixes: 64357270
Test: runtest -x $T/frameworks/base/packages/SystemUI/tests/src/com/android/systemui/util/AsyncSensorManagerTest.java

6 years agoMerge "DO NOT MERGE: Remove rate limiting for system dialer notifications" into oc...
Sailesh Nepal [Fri, 4 Aug 2017 10:14:53 +0000 (10:14 +0000)]
Merge "DO NOT MERGE: Remove rate limiting for system dialer notifications" into oc-dr1-dev
am: b4cc14b56a

Change-Id: Ie23cfd2911cc08a2eb415c2293ed0820c07bc47d