OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 19 Mar 2018 18:18:01 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
am: a903eebde6  -s ours

Change-Id: I945604f8492a09b3037f9f24610725bde38e4e29

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 19 Mar 2018 18:11:53 +0000 (18:11 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
am: 3f1a583000  -s ours

Change-Id: I0a91bc2f2e6fbdf58d72181538abdcf1e0ca8a7a

6 years agoMerge "Add disable2 flag for rotate suggestions" into pi-dev
Mike Digman [Mon, 19 Mar 2018 18:08:29 +0000 (18:08 +0000)]
Merge "Add disable2 flag for rotate suggestions" into pi-dev
am: bd24572e17

Change-Id: I4b5cd5aa47debaedb115bd78cdd19fdda2bba552

6 years agoMerge "Light greylist additions." into pi-dev
Mathew Inwood [Mon, 19 Mar 2018 18:01:29 +0000 (18:01 +0000)]
Merge "Light greylist additions." into pi-dev
am: 02a4219cb7

Change-Id: Ic7e112599f93b00e80dc18766db6f6c3cc58a68d

6 years agoMerge "Update mobile data off dialog." into pi-dev
Amin Shaikh [Mon, 19 Mar 2018 17:53:45 +0000 (17:53 +0000)]
Merge "Update mobile data off dialog." into pi-dev
am: 372719cb35

Change-Id: I5a6683df112df1672bd943d7bc21e387336a0668

6 years agoMerge "Enable cleartext for captive portal apps" into pi-dev
Lorenzo Colitti [Mon, 19 Mar 2018 17:39:34 +0000 (17:39 +0000)]
Merge "Enable cleartext for captive portal apps" into pi-dev
am: c88ca67bb3

Change-Id: Ie38d6ce6f54336db2f4672746dc7385e0a7979fb

6 years agoMerge "Frameworks: Make MockUtils more robust" into pi-dev
Andreas Gampe [Mon, 19 Mar 2018 17:29:05 +0000 (17:29 +0000)]
Merge "Frameworks: Make MockUtils more robust" into pi-dev
am: 16e56f7815

Change-Id: I9b4d9a9ef82cf373eed15cea47dd0a73aacbe56c

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 17:17:52 +0000 (17:17 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 17:17:12 +0000 (17:17 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Removed flaky annotation from testFocusedWindowMultipleDisplays" into pi-dev
Wale Ogunwale [Mon, 19 Mar 2018 17:13:32 +0000 (17:13 +0000)]
Merge "Removed flaky annotation from testFocusedWindowMultipleDisplays" into pi-dev
am: 2112d11eee

Change-Id: I92f66a688bd1f56c9f0714cad9513d9dd25bc8e6

6 years agoMerge "Add disable2 flag for rotate suggestions" into pi-dev
Mike Digman [Mon, 19 Mar 2018 17:13:30 +0000 (17:13 +0000)]
Merge "Add disable2 flag for rotate suggestions" into pi-dev

6 years agoMerge "Light greylist additions." into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 17:08:45 +0000 (17:08 +0000)]
Merge "Light greylist additions." into pi-dev

6 years agoMerge "Whitelist FullBackupDataOutput" into pi-dev
Sarah Edris [Mon, 19 Mar 2018 17:05:51 +0000 (17:05 +0000)]
Merge "Whitelist FullBackupDataOutput" into pi-dev
am: ff964696a1

Change-Id: I3145ae862985713a2db4f8d966f3791c98a7cd88

6 years agoMerge "Update mobile data off dialog." into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 16:58:23 +0000 (16:58 +0000)]
Merge "Update mobile data off dialog." into pi-dev

6 years agoMerge "Softens one of the battery strings per UI request" into pi-dev
Salvador Martinez [Mon, 19 Mar 2018 16:52:50 +0000 (16:52 +0000)]
Merge "Softens one of the battery strings per UI request" into pi-dev
am: a822d42415

Change-Id: I4c06a0be211a09650ccf78787f295b2c3602fa8e

6 years agoMerge "Enable cleartext for captive portal apps" into pi-dev
Lorenzo Colitti [Mon, 19 Mar 2018 16:49:47 +0000 (16:49 +0000)]
Merge "Enable cleartext for captive portal apps" into pi-dev

6 years agoMerge "Frameworks: Make MockUtils more robust" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 16:47:30 +0000 (16:47 +0000)]
Merge "Frameworks: Make MockUtils more robust" into pi-dev

6 years agoMerge "Removed flaky annotation from testFocusedWindowMultipleDisplays" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 16:46:19 +0000 (16:46 +0000)]
Merge "Removed flaky annotation from testFocusedWindowMultipleDisplays" into pi-dev

6 years agoMerge "Whitelist FullBackupDataOutput" into pi-dev
Sarah Edris [Mon, 19 Mar 2018 16:42:39 +0000 (16:42 +0000)]
Merge "Whitelist FullBackupDataOutput" into pi-dev

6 years agoMerge "StatsManager log lines should be in logcat" into pi-dev
Bookatz [Mon, 19 Mar 2018 16:39:14 +0000 (16:39 +0000)]
Merge "StatsManager log lines should be in logcat" into pi-dev
am: 781533dc32

Change-Id: I9b79b21a8588d4dd927a6d16bd2fb437aa69c720

6 years agoMerge "Softens one of the battery strings per UI request" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 16:27:41 +0000 (16:27 +0000)]
Merge "Softens one of the battery strings per UI request" into pi-dev

6 years agoMerge "StatsManager log lines should be in logcat" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 16:18:53 +0000 (16:18 +0000)]
Merge "StatsManager log lines should be in logcat" into pi-dev

6 years agoMerge "Insert correct app transition events for recents anim" into pi-dev
Jorim Jaggi [Mon, 19 Mar 2018 15:51:32 +0000 (15:51 +0000)]
Merge "Insert correct app transition events for recents anim" into pi-dev
am: f8cb545afb

Change-Id: I573a25113afd6666c95ceedefb33e7c994624e0d

6 years agoMerge "Insert correct app transition events for recents anim" into pi-dev
Jorim Jaggi [Mon, 19 Mar 2018 15:36:05 +0000 (15:36 +0000)]
Merge "Insert correct app transition events for recents anim" into pi-dev

6 years agoMerge "Fix SyncResutl.delayUntil javadoc" into pi-dev
Makoto Onuki [Mon, 19 Mar 2018 15:24:17 +0000 (15:24 +0000)]
Merge "Fix SyncResutl.delayUntil javadoc" into pi-dev
am: 6b71daa0c2

Change-Id: Ie14b1bdf696ed3b67867f08d5f10800d2330eddf

6 years agoMerge "Fix SyncResutl.delayUntil javadoc" into pi-dev
Makoto Onuki [Mon, 19 Mar 2018 15:12:36 +0000 (15:12 +0000)]
Merge "Fix SyncResutl.delayUntil javadoc" into pi-dev

6 years agoInsert correct app transition events for recents anim
Jorim Jaggi [Thu, 15 Mar 2018 14:51:32 +0000 (15:51 +0100)]
Insert correct app transition events for recents anim

The transition delay will be the latency until all the leashes
were created etc. Thus, the actual latency is going to be in
WINDOWS_DRAWN_DELAY.

Also fix an issue where we inadvertently started a transition,
and then the transition logger was hanging.

Bug: 72967764
Test: Swipe up from home button, observe eventlog
Change-Id: I2b1fb7d9d694a629a33653c1fa3d5ed47f53de6b

6 years agoUpdate mobile data off dialog.
Amin Shaikh [Fri, 9 Mar 2018 19:50:59 +0000 (14:50 -0500)]
Update mobile data off dialog.

Show the mobile data turn off dialog until the user taps the turn off
button. All subsequent toggles will immediately toggle data on/off. Also
update the message copy.

Fixes: 74072757
Test: runtest systemui && manual
Change-Id: I489d5c3c19d52a6f531b1b925b3210019412243b

6 years agoLight greylist additions.
Mathew Inwood [Mon, 19 Mar 2018 14:31:17 +0000 (14:31 +0000)]
Light greylist additions.

Gathered from dogfood bugreports.

Test: m

Bug: 74940461
Change-Id: I08a450f987ae0e87ab6f7306e9d89a7ca3368f70

6 years agoMerge "ConfirmationDialog: Fail if accessibility services are running." into pi-dev
David Zeuthen [Mon, 19 Mar 2018 14:39:03 +0000 (14:39 +0000)]
Merge "ConfirmationDialog: Fail if accessibility services are running." into pi-dev
am: b57365562d

Change-Id: I5cc4ac36d980a4a0b6c202ddcba4ffb5433cd149

6 years agoRemoved flaky annotation from testFocusedWindowMultipleDisplays
Wale Ogunwale [Mon, 19 Mar 2018 14:35:32 +0000 (07:35 -0700)]
Removed flaky annotation from testFocusedWindowMultipleDisplays

No longer flaky

https://dashboards.corp.google.com/google::_550f6bcf_09dd_4963_b94c_d243e37d002f?f=class_name:in:com.android.server.wm.DisplayContentTests&f=test_name:in:com.android.server.wm.DisplayContentTests.testFocusedWindowMultipleDisplays&f=run_date_usec:eq:(null)&f=presubmit:in:false&f=build_id:eq:(null)

Change-Id: I10504a24144e7636ab7205a079415f6d4eeba043
Fixes: 37908381
Test: self

6 years agoMerge "ConfirmationDialog: Fail if accessibility services are running." into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 14:27:16 +0000 (14:27 +0000)]
Merge "ConfirmationDialog: Fail if accessibility services are running." into pi-dev

6 years agoWhitelist FullBackupDataOutput
Sarah Edris [Mon, 19 Mar 2018 12:48:28 +0000 (12:48 +0000)]
Whitelist FullBackupDataOutput

Bug: 74424953
Test: N/A
Change-Id: I3b0386fa004352ef32cb03ba2c53a53bd0f6e1f1

6 years agoMerge "Fix test failure" into pi-dev
Jason Monk [Mon, 19 Mar 2018 14:21:06 +0000 (14:21 +0000)]
Merge "Fix test failure" into pi-dev
am: dff503b2e4

Change-Id: I1b42d1ce64ca03e9acf2fa3ce698f29bc1adc1a6

6 years agoMerge "Fix test failure" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 14:02:13 +0000 (14:02 +0000)]
Merge "Fix test failure" into pi-dev

6 years agoMerge "Add more hidden APIs on the light greylist" into pi-dev
David Brazdil [Mon, 19 Mar 2018 13:48:18 +0000 (13:48 +0000)]
Merge "Add more hidden APIs on the light greylist" into pi-dev
am: 1ffa03321a

Change-Id: Ie5d1cf0fb159a59cfe942da53b8ee382ed07b633

6 years agoMerge "Fix lockscreen notification launch animation" into pi-dev
Jorim Jaggi [Mon, 19 Mar 2018 13:38:09 +0000 (13:38 +0000)]
Merge "Fix lockscreen notification launch animation" into pi-dev
am: a1d6bd94fe

Change-Id: I12cbc8fbd9b087d882eebc8a1b2052e6988128c9

6 years agoMerge "Add more hidden APIs on the light greylist" into pi-dev
David Brazdil [Mon, 19 Mar 2018 13:31:55 +0000 (13:31 +0000)]
Merge "Add more hidden APIs on the light greylist" into pi-dev

6 years agoMerge "Fix lockscreen notification launch animation" into pi-dev
Jorim Jaggi [Mon, 19 Mar 2018 13:23:30 +0000 (13:23 +0000)]
Merge "Fix lockscreen notification launch animation" into pi-dev

6 years agoMerge "Trace currently resumed app" into pi-dev
Jorim Jaggi [Mon, 19 Mar 2018 13:21:40 +0000 (13:21 +0000)]
Merge "Trace currently resumed app" into pi-dev
am: 782e63d507

Change-Id: Ieee8fabfa9564d52d60cc58f68af986d2e56e43e

6 years agoMerge "Close file descriptors of ProfilerInfo" into pi-dev
Madiyar Aitbayev [Mon, 19 Mar 2018 13:14:53 +0000 (13:14 +0000)]
Merge "Close file descriptors of ProfilerInfo" into pi-dev
am: de91eef76e

Change-Id: I3d7cbb7423cae868a52fc88e2055eea32831a390

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 19 Mar 2018 13:12:52 +0000 (06:12 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Icb81b9c2336d04310365592f1cccb53dad0c0403

6 years agoMerge "Trace currently resumed app" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 13:06:30 +0000 (13:06 +0000)]
Merge "Trace currently resumed app" into pi-dev

6 years agoMerge "Close file descriptors of ProfilerInfo" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 12:53:21 +0000 (12:53 +0000)]
Merge "Close file descriptors of ProfilerInfo" into pi-dev

6 years agoMerge "Don't allow focus on activity in minimized split-screen." into pi-dev
Wale Ogunwale [Mon, 19 Mar 2018 12:44:47 +0000 (12:44 +0000)]
Merge "Don't allow focus on activity in minimized split-screen." into pi-dev
am: 5a8deab6c8

Change-Id: I65db000108edf8f20119a8de11fbcaac28cc7efd

6 years agoMerge "Don't allow focus on activity in minimized split-screen." into pi-dev
Wale Ogunwale [Mon, 19 Mar 2018 12:30:08 +0000 (12:30 +0000)]
Merge "Don't allow focus on activity in minimized split-screen." into pi-dev

6 years agoMerge "DPM: Fix isActivePasswordSufficient for non-FBE devices" into pi-dev
Eran Messeri [Mon, 19 Mar 2018 11:38:35 +0000 (11:38 +0000)]
Merge "DPM: Fix isActivePasswordSufficient for non-FBE devices" into pi-dev
am: 31ac587b43

Change-Id: I8b07132a161275e55204598183c2cecfb7d9234d

6 years agoMerge "DPM: Fix isActivePasswordSufficient for non-FBE devices" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 11:20:27 +0000 (11:20 +0000)]
Merge "DPM: Fix isActivePasswordSufficient for non-FBE devices" into pi-dev

6 years agoMerge "MediaSession2: Implement fastForward() / rewind()" into pi-dev
Jaewan Kim [Mon, 19 Mar 2018 10:59:39 +0000 (10:59 +0000)]
Merge "MediaSession2: Implement fastForward() / rewind()" into pi-dev
am: d65bb20283

Change-Id: Id01780a8074428de178b49e8c7dbf3000bfdee71

6 years agoAdd more hidden APIs on the light greylist
David Brazdil [Fri, 16 Mar 2018 17:24:51 +0000 (17:24 +0000)]
Add more hidden APIs on the light greylist

Uses reported by the public.

Bug: 64382372
Bug: 74524607
Bug: 74271830
Bug: 74498446
Bug: 74272004
Bug: 74322289
Bug: 74278847
Bug: 74175716
Bug: 74131602
Bug: 74357020
Bug: 74265544
Bug: 74130810
Bug: 74537180
Bug: 74496079
Bug: 74600951
Test: make
Change-Id: I884e76101bdd3d6b08a690810a5b4f5e09306980

6 years agoMerge "MediaSession2: Implement fastForward() / rewind()" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 10:45:03 +0000 (10:45 +0000)]
Merge "MediaSession2: Implement fastForward() / rewind()" into pi-dev

6 years agoMediaSession2: Implement fastForward() / rewind()
Jaewan Kim [Thu, 15 Mar 2018 11:31:06 +0000 (20:31 +0900)]
MediaSession2: Implement fastForward() / rewind()

Bug: 74724709
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: Ibd313dc6eed82a5d7cc9fc156f7851aba13f9e29

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 19 Mar 2018 08:34:02 +0000 (01:34 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I689307250cc85c025fca7fd0a0ffbfe30f909fb1

6 years agoMerge "Delete TODO about renumbering statd atoms" into pi-dev
Bookatz [Mon, 19 Mar 2018 06:19:11 +0000 (06:19 +0000)]
Merge "Delete TODO about renumbering statd atoms" into pi-dev
am: 790befca1d

Change-Id: I0d57aa401f5389be5f8c5a0cea617c12cb5f316d

6 years agoMerge changes I3ffb6e97,I689df136,Ia67a8eb6 into pi-dev
Bookatz [Mon, 19 Mar 2018 06:12:38 +0000 (06:12 +0000)]
Merge changes I3ffb6e97,I689df136,Ia67a8eb6 into pi-dev
am: ad121b9fdc

Change-Id: I2891370252221fce86e911d7193f22433ed3c6be

6 years agoMerge "Delete TODO about renumbering statd atoms" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 05:54:22 +0000 (05:54 +0000)]
Merge "Delete TODO about renumbering statd atoms" into pi-dev

6 years agoMerge changes I3ffb6e97,I689df136,Ia67a8eb6 into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 05:49:27 +0000 (05:49 +0000)]
Merge changes I3ffb6e97,I689df136,Ia67a8eb6 into pi-dev

* changes:
  Statsd: remove DurationAnomalyTracker.resetStorage
  Statsd AnomalyDetection stopAlarm also checks old
  Statsd AnomalyDetection improvements

6 years agoMerge "Disable scrim focus on AOD" into pi-dev
Lucas Dupin [Mon, 19 Mar 2018 05:22:05 +0000 (05:22 +0000)]
Merge "Disable scrim focus on AOD" into pi-dev
am: 0487601e57

Change-Id: I1800a1de9842e52188fe6b40ce5da6f9a96b19ea

6 years agoMerge "Disable scrim focus on AOD" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 05:03:50 +0000 (05:03 +0000)]
Merge "Disable scrim focus on AOD" into pi-dev

6 years agoMerge "Remove Context requirement from updatable" into pi-dev
Christofer Åkersten [Mon, 19 Mar 2018 04:15:10 +0000 (04:15 +0000)]
Merge "Remove Context requirement from updatable" into pi-dev
am: ac16fb5d41

Change-Id: I28b4e0afef99e607a8e56528d9249b6db325b1b1

6 years agoMerge "Remove Context requirement from updatable" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 04:02:29 +0000 (04:02 +0000)]
Merge "Remove Context requirement from updatable" into pi-dev

6 years agoMerge changes Ia438f4a2,I356c2d57 into pi-dev
Lucas Dupin [Mon, 19 Mar 2018 03:33:45 +0000 (03:33 +0000)]
Merge changes Ia438f4a2,I356c2d57 into pi-dev
am: f5d216cc7c

Change-Id: I9d5b266c1ebe8f72fea98516add59a3abe434fbb

6 years agoMerge changes Ia438f4a2,I356c2d57 into pi-dev
Lucas Dupin [Mon, 19 Mar 2018 03:11:51 +0000 (03:11 +0000)]
Merge changes Ia438f4a2,I356c2d57 into pi-dev

* changes:
  Bouncer notification and QS scrim
  Fix bouncer not showing on top of QS or notif

6 years agoMerge "SystemUI: Temporarily disable test" into pi-dev
Andreas Gampe [Mon, 19 Mar 2018 01:32:21 +0000 (01:32 +0000)]
Merge "SystemUI: Temporarily disable test" into pi-dev
am: 28e22c4ae1

Change-Id: I5a8658a5c141133017c776174b893435e8bd6ea3

6 years agoMerge "SystemUI: Temporarily disable test" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 01:18:22 +0000 (01:18 +0000)]
Merge "SystemUI: Temporarily disable test" into pi-dev

6 years agoFrameworks: Make MockUtils more robust
Andreas Gampe [Sun, 18 Mar 2018 23:46:24 +0000 (16:46 -0700)]
Frameworks: Make MockUtils more robust

Avoid a NullPointerException.

Bug: 75459260
Test: mmma frameworks/base/services/tests/servicestests
Change-Id: I2e273b3bd808226507e5e50b537d70edb25950a6

6 years agoMerge "Writes the resource table proto out when writing a LoadedApk." into pi-dev
Cory Smith [Sun, 18 Mar 2018 23:19:40 +0000 (23:19 +0000)]
Merge "Writes the resource table proto out when writing a LoadedApk." into pi-dev
am: 449be81065

Change-Id: If6e57967cc36a1c69c709a7aee60730aca967d2e

6 years agoMerge "Writes the resource table proto out when writing a LoadedApk." into pi-dev
Cory Smith [Sun, 18 Mar 2018 22:59:27 +0000 (22:59 +0000)]
Merge "Writes the resource table proto out when writing a LoadedApk." into pi-dev

6 years agoSystemUI: Temporarily disable test
Andreas Gampe [Sun, 18 Mar 2018 22:35:39 +0000 (15:35 -0700)]
SystemUI: Temporarily disable test

Bug: 75329085
Test: none
Exempt-From-Owner-Approval: Let TH pass while investigating
Change-Id: I4c007e5162502f0064b65a89408882e4c348e0db

6 years agoWrites the resource table proto out when writing a LoadedApk.
corysmith@google.com [Tue, 13 Mar 2018 16:04:10 +0000 (12:04 -0400)]
Writes the resource table proto out when writing a LoadedApk.

Small fixes for consistancy to use constants instead of strings.

Change-Id: I33439c376e1634b7957730ce16e241b0f5bb92f8
Fixes: 74594854
Test: Manual, tested against blaze test //javatests/com/google/devtools/build/android:UnitTests

6 years agoStatsManager log lines should be in logcat
Bookatz [Sat, 17 Mar 2018 00:13:33 +0000 (17:13 -0700)]
StatsManager log lines should be in logcat

Change the Slog.d to Slog.w and enable them, so that we can see them.
They seem to represent important failure events when people call the
public API into StatsManager.

Bug: 74997752
Test: none
Change-Id: I1c577b32358158f73453a8a3066013e0f3733d87

6 years agoBouncer notification and QS scrim
Lucas Dupin [Tue, 13 Mar 2018 21:00:24 +0000 (14:00 -0700)]
Bouncer notification and QS scrim

Show front scrim when the notification panel is expanded,
otherwise pin would be overlayed on top of notifications.

Change-Id: Ia438f4a2794eb9510ec05ad86cc8c19e2e716358
Fixes: 74550013
Test: double tap on notification when locked
Test: tap on QS edit button when locked
Test: unlock by swipping up
Test: fling quickly on keyguard

6 years agoMerge "Modify time only mode flag into set of values instead of just one." into pi-dev
Michael Kwan [Sat, 17 Mar 2018 22:22:33 +0000 (22:22 +0000)]
Merge "Modify time only mode flag into set of values instead of just one." into pi-dev
am: c5d0ed9f3c

Change-Id: I4721197b1329a14aa51f1b49a05bdade1fb71ef8

6 years agoMerge "Modify time only mode flag into set of values instead of just one." into pi-dev
Michael Kwan [Sat, 17 Mar 2018 22:05:38 +0000 (22:05 +0000)]
Merge "Modify time only mode flag into set of values instead of just one." into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sat, 17 Mar 2018 15:36:11 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
am: 9331af7220  -s ours

Change-Id: Ib91e7e1c4c5a066c2191c29ad1f6df7ca7a0f14f

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 17 Mar 2018 15:22:58 +0000 (15:22 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Add placeholder on DND settings screen." into pi-dev
Julia Reynolds [Sat, 17 Mar 2018 14:40:46 +0000 (14:40 +0000)]
Merge "Add placeholder on DND settings screen." into pi-dev
am: d7f32a1a7f

Change-Id: Ie41b7e7d2a13941512ef1590c013d2e3e4523d83

6 years agoMerge "Add placeholder on DND settings screen." into pi-dev
Julia Reynolds [Sat, 17 Mar 2018 14:28:41 +0000 (14:28 +0000)]
Merge "Add placeholder on DND settings screen." into pi-dev

6 years agoRemove Context requirement from updatable
Christofer Åkersten [Thu, 15 Mar 2018 11:24:39 +0000 (20:24 +0900)]
Remove Context requirement from updatable

Bug: 74843539
Test: runtest-cts-MediaComponents && atest VideoView2Test
Change-Id: Iba5422f8d092205316ec3fa2c10da6d3f983fde6

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 17 Mar 2018 06:33:48 +0000 (23:33 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I4f0cac1ca19646cb5e45c5d84814883a3c11c1d6

6 years agoMerge "Docstring Updates for applyTransportModeTransform" into pi-dev
Nathan Harold [Sat, 17 Mar 2018 03:59:36 +0000 (03:59 +0000)]
Merge "Docstring Updates for applyTransportModeTransform" into pi-dev
am: 685288127d  -s ours

Change-Id: I98698ebd0a3aa97250274830dadb4c70e41a7e3e

6 years agoMerge "Docstring Updates for applyTransportModeTransform" into pi-dev
TreeHugger Robot [Sat, 17 Mar 2018 03:44:46 +0000 (03:44 +0000)]
Merge "Docstring Updates for applyTransportModeTransform" into pi-dev

6 years agoMerge "Docstring Updates for applyTransportModeTransform" am: 00ef20e853
nharold [Sat, 17 Mar 2018 02:16:38 +0000 (02:16 +0000)]
Merge "Docstring Updates for applyTransportModeTransform" am: 00ef20e853
am: e3a6b678c3

Change-Id: I58ab2b451ef1d0c20efe80d30a679e8870a39a8e

6 years agoMerge "Don't truncate empty text on low density" into pi-dev
Julia Reynolds [Sat, 17 Mar 2018 02:01:36 +0000 (02:01 +0000)]
Merge "Don't truncate empty text on low density" into pi-dev
am: 731514eb88

Change-Id: I90f1a56e4e976aafa04d6ed8f664ba2468d2f00e

6 years agoMerge "Docstring Updates for applyTransportModeTransform"
nharold [Sat, 17 Mar 2018 02:00:57 +0000 (02:00 +0000)]
Merge "Docstring Updates for applyTransportModeTransform"
am: 00ef20e853

Change-Id: I2b59ebf0b751f7f404d175ad394a4dfdbf7169ff

6 years agoMerge "Add new semantic Person fields" into pi-dev
Julia Reynolds [Sat, 17 Mar 2018 01:50:45 +0000 (01:50 +0000)]
Merge "Add new semantic Person fields" into pi-dev
am: 6389e7bc44

Change-Id: I316ff063efbe3c36a34e3e9e00a463ae4364c4bd

6 years agoMerge "Don't truncate empty text on low density" into pi-dev
Julia Reynolds [Sat, 17 Mar 2018 01:36:04 +0000 (01:36 +0000)]
Merge "Don't truncate empty text on low density" into pi-dev

6 years agoMerge "Add new semantic Person fields" into pi-dev
Julia Reynolds [Sat, 17 Mar 2018 01:35:20 +0000 (01:35 +0000)]
Merge "Add new semantic Person fields" into pi-dev

6 years agoAdd placeholder on DND settings screen.
Julia Reynolds [Thu, 15 Mar 2018 13:27:31 +0000 (09:27 -0400)]
Add placeholder on DND settings screen.

Test: make
Bug: 74321426
Change-Id: Ie457b3c994a0d851d835a56a01c28a0acbf102e3

6 years agoMerge "Add cycle-clean option in AppLaunch" into pi-dev
Gopinath Elanchezhian [Sat, 17 Mar 2018 01:07:58 +0000 (01:07 +0000)]
Merge "Add cycle-clean option in AppLaunch" into pi-dev
am: e588d6145d

Change-Id: Iae1ebd4f544992dbdfccb27b06bd5ff66c8b4be5

6 years agoMerge "Add cycle-clean option in AppLaunch" into pi-dev
Gopinath Elanchezhian [Sat, 17 Mar 2018 00:55:05 +0000 (00:55 +0000)]
Merge "Add cycle-clean option in AppLaunch" into pi-dev

6 years agoDocstring Updates for applyTransportModeTransform
Nathan Harold [Tue, 6 Mar 2018 21:22:22 +0000 (13:22 -0800)]
Docstring Updates for applyTransportModeTransform

-Add anotations to usages of PolicyDirection for
 apply...() methods.
-Update the comments on DIRECTION_IN and DIRECTION_OUT
 to better reflect their current usage.
-Add a better explanation to the rekey procedure doc.
-Remove disused createTunnelInterface() stub.

Bug: 73751066
Test: make docs
Merged-In: I9f2ec864466148a18899f1e952c74a525902ccbc
Change-Id: I9f2ec864466148a18899f1e952c74a525902ccbc
(cherry picked from commit f4cdf25a906d0f52ffd76508d660b843b13b3ff8)

6 years agoMerge "Hide notifications when in Lockdown mode" into pi-dev
Chad Brubaker [Sat, 17 Mar 2018 00:39:12 +0000 (00:39 +0000)]
Merge "Hide notifications when in Lockdown mode" into pi-dev
am: 36b0b60e40

Change-Id: I693e95915f60638ae769433e778c2b11bb11e82e

6 years agoMerge "Docstring Updates for applyTransportModeTransform"
nharold [Sat, 17 Mar 2018 00:33:10 +0000 (00:33 +0000)]
Merge "Docstring Updates for applyTransportModeTransform"

6 years agoDocstring Updates for applyTransportModeTransform
Nathan Harold [Tue, 6 Mar 2018 21:22:22 +0000 (13:22 -0800)]
Docstring Updates for applyTransportModeTransform

-Add anotations to usages of PolicyDirection for
 apply...() methods.
-Update the comments on DIRECTION_IN and DIRECTION_OUT
 to better reflect their current usage.
-Add a better explanation to the rekey procedure doc.
-Remove disused createTunnelInterface() stub.

Bug: 73751066
Test: make docs
Change-Id: I9f2ec864466148a18899f1e952c74a525902ccbc

6 years agoMerge "Add null check to RecentTasks.java" into pi-dev
Wale Ogunwale [Sat, 17 Mar 2018 00:26:02 +0000 (00:26 +0000)]
Merge "Add null check to RecentTasks.java" into pi-dev
am: ad5d8175da

Change-Id: I6da61f3b5b33a38f03ebe15ee6c7b3d5f3c983b0

6 years agoMerge "Allow carrier-privileged apps to register telephony listeners." into pi-dev
Jeff Davidson [Sat, 17 Mar 2018 00:19:14 +0000 (00:19 +0000)]
Merge "Allow carrier-privileged apps to register telephony listeners." into pi-dev
am: 03c07f859d  -s ours

Change-Id: Iaf3f401f46a8c1be27662bba0581f2bad154118d

6 years agoMerge "Hide notifications when in Lockdown mode" into pi-dev
Chad Brubaker [Sat, 17 Mar 2018 00:16:34 +0000 (00:16 +0000)]
Merge "Hide notifications when in Lockdown mode" into pi-dev

6 years agoAllow carrier-privileged apps to register telephony listeners.
Jeff Davidson [Sat, 17 Mar 2018 00:13:02 +0000 (00:13 +0000)]
Allow carrier-privileged apps to register telephony listeners.
am: 29da89ffbf  -s ours

Change-Id: Ida390a6230eedec75b179538f777aa84bfc9f485

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Fri, 16 Mar 2018 23:56:42 +0000 (23:56 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
am: bc14009d66  -s ours

Change-Id: Ia68e6c8d36fa6831912b7d8a8685c8e5bf50d79b