OSDN Git Service
Jason Monk [Wed, 11 Apr 2018 19:37:44 +0000 (12:37 -0700)]
Merge "Fix docs and bug in SliceManager#bindSlice" into pi-dev am:
c2375d9b3d
am:
df0975bba5
Change-Id: I932361f18e0619224e840f4582c729908818fa96
Colin Cross [Wed, 11 Apr 2018 19:32:06 +0000 (12:32 -0700)]
Merge "Revert "Update docs to match encryption requirements"" into pi-dev am:
fcbbb72603
am:
3b11a4cb19
Change-Id: Iea81963ea09510a5c3d1c8d801dde83201122743
Nathan Harold [Wed, 11 Apr 2018 19:22:28 +0000 (12:22 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] - Hide Tunnel Mode IpSec API" into pi-dev am:
68e5f0f242
am:
adff790058 -s ours
Change-Id: I87cd6636dd2c4a6ff34a0eb60907f3d7df22d90c
Nan Zhang [Wed, 11 Apr 2018 19:03:26 +0000 (12:03 -0700)]
Merge "Add filegroup for supporting apache-http stubs generation." into pi-dev-plus-aosp
am:
d25adf96e3
Change-Id: I23389b41f7fb05677902fbd7a807a718e9f2be49
Bookatz [Wed, 11 Apr 2018 18:56:31 +0000 (11:56 -0700)]
Merge "StatsManager throws exceptions" into pi-dev am:
6b317915e8
am:
b1d3483102
Change-Id: Ib8b72e4a6a21300ba843325a69847856bd9346aa
Jason Monk [Wed, 11 Apr 2018 18:56:07 +0000 (11:56 -0700)]
Merge "Fix docs and bug in SliceManager#bindSlice" into pi-dev
am:
c2375d9b3d
Change-Id: Id7145e9d6432586d295f59b67a4f3b7e44d935b1
Colin Cross [Wed, 11 Apr 2018 18:44:45 +0000 (11:44 -0700)]
Merge "Revert "Update docs to match encryption requirements"" into pi-dev
am:
fcbbb72603
Change-Id: I7b66ab3cb2362a6fa91d90b4b7237d6f3760b406
Alex Chau [Wed, 11 Apr 2018 18:43:29 +0000 (11:43 -0700)]
Merge "Dismiss keyguard when switching user if lockscreen is disabled on new user" into pi-dev am:
87646514be
am:
de458dba2f
Change-Id: I4c19926341e379bf98e971a991bca3f788a6fa6a
Nathan Harold [Wed, 11 Apr 2018 18:39:56 +0000 (11:39 -0700)]
Merge "[DO NOT MERGE] - Hide Tunnel Mode IpSec API" into pi-dev
am:
68e5f0f242
Change-Id: I2542b4dcb94b306e3fe2e3e87051f1bd6a481561
Bryce Lee [Wed, 11 Apr 2018 18:38:22 +0000 (11:38 -0700)]
Merge "Ensure ActivityStack's cached resumed activity is updated." into pi-dev am:
6f14dc95cf
am:
73ffa4e88a
Change-Id: I34d4c0f6b1021c1e1c8ae8db3a7ee2a1ab8b39bf
David Brazdil [Wed, 11 Apr 2018 18:25:10 +0000 (11:25 -0700)]
Merge "Greylist methods with varargs and intrinsics" into pi-dev am:
1eff922e34
am:
34cb87cf45
Change-Id: I65dc2ec5c33d280192a06b01b9a39621b8f8d840
TreeHugger Robot [Wed, 11 Apr 2018 18:20:42 +0000 (18:20 +0000)]
Merge "Add filegroup for supporting apache-http stubs generation." into pi-dev-plus-aosp
Bookatz [Wed, 11 Apr 2018 18:19:33 +0000 (11:19 -0700)]
Merge "StatsManager throws exceptions" into pi-dev
am:
6b317915e8
Change-Id: I3de523046404285f3bcc7bfff598393d7c16820d
Chavi Weingarten [Wed, 11 Apr 2018 18:13:43 +0000 (11:13 -0700)]
Merge "Synchronize stack position and size update for split screen" into pi-dev am:
9553a11557
am:
5826a2a7ad
Change-Id: Ie8a24f3b8ae0c1fa1d9576118b1404e96dfe184c
Alex Chau [Wed, 11 Apr 2018 18:13:30 +0000 (11:13 -0700)]
Merge "Dismiss keyguard when switching user if lockscreen is disabled on new user" into pi-dev
am:
87646514be
Change-Id: I083f1e5c59090340be8afbd4c5178db16ef12772
Bryce Lee [Wed, 11 Apr 2018 18:09:37 +0000 (11:09 -0700)]
Merge "Ensure ActivityStack's cached resumed activity is updated." into pi-dev
am:
6f14dc95cf
Change-Id: I1cda8ecb6e0878ffd133a35b32259171991762b2
Anton Philippov [Wed, 11 Apr 2018 18:07:52 +0000 (11:07 -0700)]
Merge "Pass app version to agent in adb restore for kv." into pi-dev am:
133f93bbbb
am:
0d383d2ee4
Change-Id: Icc2051dd9f08d8c0c48e0bb96621a203b6d979c7
Julia Reynolds [Wed, 11 Apr 2018 18:00:32 +0000 (11:00 -0700)]
Merge "Update volume logging" into pi-dev am:
259bdbf43d
am:
1691d42e1a
Change-Id: Id322f1123c1f430c809f7469d3435def9375df3a
David Brazdil [Wed, 11 Apr 2018 17:57:56 +0000 (10:57 -0700)]
Merge "Greylist methods with varargs and intrinsics" into pi-dev
am:
1eff922e34
Change-Id: I2cf0a3459b3723aa263d5ae6ca4dafe3a589181d
TreeHugger Robot [Wed, 11 Apr 2018 17:54:19 +0000 (17:54 +0000)]
Merge "Remove redundant "test" prefix from InputMethodAndSubtypeUtilTest"
Chavi Weingarten [Wed, 11 Apr 2018 17:52:25 +0000 (10:52 -0700)]
Merge "Synchronize stack position and size update for split screen" into pi-dev
am:
9553a11557
Change-Id: Ie9308010a2c856284aca2fdc53304e3b79a080bb
TreeHugger Robot [Wed, 11 Apr 2018 17:52:22 +0000 (17:52 +0000)]
Merge "Fix docs and bug in SliceManager#bindSlice" into pi-dev
Anton Philippov [Wed, 11 Apr 2018 17:48:40 +0000 (10:48 -0700)]
Merge "Pass app version to agent in adb restore for kv." into pi-dev
am:
133f93bbbb
Change-Id: I8c16ca2f13a7c03fd754928422b736658a53f779
Mathew Inwood [Wed, 11 Apr 2018 17:43:38 +0000 (10:43 -0700)]
Merge "Configurable sampling rate for hidden API access log events." into pi-dev am:
fb55bd8706
am:
d39b02157b
Change-Id: I135d9a3bb38c238185763dd14ef103ea860fbb1a
Julia Reynolds [Wed, 11 Apr 2018 17:40:24 +0000 (10:40 -0700)]
Merge "Update volume logging" into pi-dev
am:
259bdbf43d
Change-Id: I98caa2367c2aa6cf569685147cd4a71efc78ab6c
Yao Chen [Wed, 11 Apr 2018 17:33:56 +0000 (10:33 -0700)]
Merge "Handle logd reconnect." into pi-dev am:
2e0f45f087
am:
808582230d
Change-Id: I27755cf706e3fe4d131d372173b4ffe78deb821b
Adrian Roos [Wed, 11 Apr 2018 17:28:59 +0000 (10:28 -0700)]
Merge "DisplayCutout: Draw anti-aliased bounds in soft overlay" into pi-dev am:
2370f368d4
am:
0c4b2b7f63
Change-Id: I57baa3022ea2228aae19b88bd9524b59690463e9
Colin Cross [Wed, 11 Apr 2018 17:28:39 +0000 (17:28 +0000)]
Merge "Revert "Update docs to match encryption requirements"" into pi-dev
Colin Cross [Wed, 11 Apr 2018 17:27:24 +0000 (17:27 +0000)]
Revert "Update docs to match encryption requirements"
This reverts commit
cebb55ea9d98dc7ba93eed520b874ac24ff96800.
Reason for revert: broke docs builds
Change-Id: I3a4b8d274141efec90fae2ed0b9324194288c635
Phil Weaver [Wed, 11 Apr 2018 17:23:46 +0000 (10:23 -0700)]
Merge "Fix AccessibilityEvent#getContentChangeTypes doc" into pi-dev am:
441ef0b94b
am:
ca312e6c9f
Change-Id: Ic779890b6d645bf70ed72b25c9d185e0ed602b99
Mathew Inwood [Wed, 11 Apr 2018 17:19:04 +0000 (10:19 -0700)]
Merge "Configurable sampling rate for hidden API access log events." into pi-dev
am:
fb55bd8706
Change-Id: I734dffcd6c993bf718d6835a734be26de5d76780
Mike Digman [Wed, 11 Apr 2018 17:14:27 +0000 (10:14 -0700)]
Merge "Fix null running task info in SysUI tests" into pi-dev am:
997e7b7ea4
am:
1a78073397
Change-Id: I3dc53c8a0a5a6bca8b69f8e5b30002adc7042849
Yao Chen [Wed, 11 Apr 2018 17:10:46 +0000 (10:10 -0700)]
Merge "Handle logd reconnect." into pi-dev
am:
2e0f45f087
Change-Id: I15cdb063331da9b1e6479d598314fb1cf05ab9f1
Nathan Harold [Wed, 11 Apr 2018 17:09:07 +0000 (17:09 +0000)]
Merge "[DO NOT MERGE] - Hide Tunnel Mode IpSec API" into pi-dev
Adrian Roos [Wed, 11 Apr 2018 17:06:56 +0000 (10:06 -0700)]
Merge "DisplayCutout: Draw anti-aliased bounds in soft overlay" into pi-dev
am:
2370f368d4
Change-Id: Ifae0d5e2c5bc226eaaf4462dd9b9cb044c8340b8
TreeHugger Robot [Wed, 11 Apr 2018 17:02:06 +0000 (17:02 +0000)]
Merge "StatsManager throws exceptions" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 17:02:00 +0000 (17:02 +0000)]
Merge "Dismiss keyguard when switching user if lockscreen is disabled on new user" into pi-dev
Patrick Baumann [Wed, 11 Apr 2018 17:01:45 +0000 (10:01 -0700)]
Merge "Revert "Check permissions only against packagesettings"" into pi-dev am:
61aebf6d39
am:
364100b737
Change-Id: I8bfcbb451463e1265f43e7d9b3405b328873c5f9
Phil Weaver [Wed, 11 Apr 2018 17:01:04 +0000 (10:01 -0700)]
Merge "Fix AccessibilityEvent#getContentChangeTypes doc" into pi-dev
am:
441ef0b94b
Change-Id: I41f5d4b21754b11be1ef7b0613598cd56e999ece
Bryce Lee [Wed, 11 Apr 2018 17:00:26 +0000 (17:00 +0000)]
Merge "Ensure ActivityStack's cached resumed activity is updated." into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 16:58:49 +0000 (16:58 +0000)]
Merge "Greylist methods with varargs and intrinsics" into pi-dev
Chavi Weingarten [Wed, 11 Apr 2018 16:53:42 +0000 (16:53 +0000)]
Merge "Synchronize stack position and size update for split screen" into pi-dev
Anton Philippov [Wed, 11 Apr 2018 16:53:30 +0000 (16:53 +0000)]
Merge "Pass app version to agent in adb restore for kv." into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 16:49:15 +0000 (16:49 +0000)]
Merge "Update volume logging" into pi-dev
Mike Digman [Wed, 11 Apr 2018 16:47:37 +0000 (09:47 -0700)]
Merge "Fix null running task info in SysUI tests" into pi-dev
am:
997e7b7ea4
Change-Id: I6fb0654d6fe06f23cc1bac282f5005693e523bf7
Mathew Inwood [Wed, 11 Apr 2018 16:45:19 +0000 (16:45 +0000)]
Merge "Configurable sampling rate for hidden API access log events." into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 16:45:11 +0000 (16:45 +0000)]
Merge "Handle logd reconnect." into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 16:44:32 +0000 (16:44 +0000)]
Merge "DisplayCutout: Draw anti-aliased bounds in soft overlay" into pi-dev
Siyamed Sinir [Wed, 11 Apr 2018 16:43:03 +0000 (09:43 -0700)]
Merge "Change fonts.xml to add 34 new fonts in OTF." into pi-dev am:
239d9d86d9
am:
eba4e64bfe
Change-Id: Ibc9d84fd16c66de07a4807245d58d4f98830d988
Patrick Baumann [Wed, 11 Apr 2018 16:41:34 +0000 (09:41 -0700)]
Merge "Revert "Check permissions only against packagesettings"" into pi-dev
am:
61aebf6d39
Change-Id: Idfe77e93a7dd1f3e87e58c1f323c080ed615a57a
Phil Weaver [Wed, 11 Apr 2018 16:38:28 +0000 (16:38 +0000)]
Merge "Fix AccessibilityEvent#getContentChangeTypes doc" into pi-dev
Bo Zhu [Wed, 11 Apr 2018 16:36:14 +0000 (09:36 -0700)]
Merge "Add an API to check whether the recoverable keystore is enabled" into pi-dev am:
4d1b57dad3
am:
4e7fbda633
Change-Id: If8c6f98bc40afd40428888c9d01665e59749660e
Siyamed Sinir [Wed, 11 Apr 2018 16:31:45 +0000 (09:31 -0700)]
Merge "Change fonts.xml to add 34 new fonts in OTF." into pi-dev
am:
239d9d86d9
Change-Id: I3fd36707aa0eb6011caf647f7ea03043e5f53961
Chad Brubaker [Wed, 11 Apr 2018 16:24:30 +0000 (09:24 -0700)]
Merge "Allow shared users to rotate signing certs in an OTA" into pi-dev am:
c826eec11f
am:
52e9e9787d
Change-Id: If9d77ffe534d8b7af7c5d6c17ad9f84ee76fd5b3
Bo Zhu [Wed, 11 Apr 2018 16:21:14 +0000 (09:21 -0700)]
Merge "Add an API to check whether the recoverable keystore is enabled" into pi-dev
am:
4d1b57dad3
Change-Id: I07106b9b06f290d6d464a8d5bfbf82d90e95e000
Mike Digman [Wed, 11 Apr 2018 16:12:47 +0000 (16:12 +0000)]
Merge "Fix null running task info in SysUI tests" into pi-dev
Adrian Roos [Tue, 10 Apr 2018 22:17:08 +0000 (15:17 -0700)]
DisplayCutout: Draw anti-aliased bounds in soft overlay
To do so, we cannot use the Region from DisplayCutout, because it is conceptionally
a binary Bitmap. Instead, we need the exact curve as a Path.
Also fixes a theoretical bug where the DisplayCutout
was cached even though the display height changed.
Change-Id: I9356f4589186fedc5dc95010c7bd1a1fa20edf5e
Fixes:
77868940
Test: Enable display cutout in developer options, verify the edges look smoth and not jagged.
Test: atest DisplayCutoutTest
Chad Brubaker [Wed, 11 Apr 2018 16:12:27 +0000 (09:12 -0700)]
Merge "Allow shared users to rotate signing certs in an OTA" into pi-dev
am:
c826eec11f
Change-Id: I0bbb0a9ab3c60fdf71b69dbda2ef02508fa07eb4
jiabin [Wed, 11 Apr 2018 16:12:10 +0000 (09:12 -0700)]
Merge "Fix mic enumeration CTS fail on marlin." into pi-dev am:
0b5dd8e560
am:
76e69b0812
Change-Id: Id7580ece4bc0da834424f4e21fcae99ac5ae53c1
TreeHugger Robot [Wed, 11 Apr 2018 16:05:39 +0000 (16:05 +0000)]
Merge "Revert "Check permissions only against packagesettings"" into pi-dev
Siyamed Sinir [Wed, 11 Apr 2018 16:04:52 +0000 (16:04 +0000)]
Merge "Change fonts.xml to add 34 new fonts in OTF." into pi-dev
jiabin [Wed, 11 Apr 2018 16:00:10 +0000 (09:00 -0700)]
Merge "Fix mic enumeration CTS fail on marlin." into pi-dev
am:
0b5dd8e560
Change-Id: I681eb47ec1577ad6c2b35d0e739c249bf61f0f26
Bo Zhu [Wed, 11 Apr 2018 15:58:27 +0000 (15:58 +0000)]
Merge "Add an API to check whether the recoverable keystore is enabled" into pi-dev
Chad Brubaker [Wed, 11 Apr 2018 15:57:21 +0000 (15:57 +0000)]
Merge "Allow shared users to rotate signing certs in an OTA" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 15:49:42 +0000 (15:49 +0000)]
Merge "Ensure we do not set seInfoTargetSdkVersion to 0."
TreeHugger Robot [Wed, 11 Apr 2018 15:46:49 +0000 (15:46 +0000)]
Merge "Fix mic enumeration CTS fail on marlin." into pi-dev
Dan Gittik [Wed, 11 Apr 2018 15:29:30 +0000 (08:29 -0700)]
Merge "Added gamma correction tests." into pi-dev am:
02fea072ab
am:
01f36332ef
Change-Id: I8f55e07728e4d89b9045f6db5c3590426a73e26d
Tim Volodine [Wed, 11 Apr 2018 15:14:03 +0000 (08:14 -0700)]
Merge "[WebView Tracing API] documentation fixes." into pi-dev am:
4800d9a9e7
am:
234d296360
Change-Id: I69f1e212c2727bf81e40ab239013c977c2f1e3ff
Dan Gittik [Wed, 11 Apr 2018 15:11:14 +0000 (08:11 -0700)]
Merge "Added gamma correction tests." into pi-dev
am:
02fea072ab
Change-Id: I84f4e961128888cf9a3b01b3584221dd60609a10
TreeHugger Robot [Wed, 11 Apr 2018 15:03:46 +0000 (15:03 +0000)]
Merge "Deprecate InputMethodUtils#isSystemIme() part 3"
Tim Volodine [Wed, 11 Apr 2018 14:56:25 +0000 (07:56 -0700)]
Merge "[WebView Tracing API] documentation fixes." into pi-dev
am:
4800d9a9e7
Change-Id: I226ef118f27661a94502e990ba89ad662f63f583
Patrick Baumann [Wed, 11 Apr 2018 14:51:30 +0000 (14:51 +0000)]
Revert "Check permissions only against packagesettings"
This reverts commit
b00eb6459127018ec7641f407d5873a0c417416d.
Reason for revert: Boot issues after OTA
Bug:
76228188
Fixes:
77888575
Change-Id: I5ca2605cb6befea46ce50198bc72bdd4b6e84f1a
TreeHugger Robot [Wed, 11 Apr 2018 14:48:17 +0000 (14:48 +0000)]
Merge "Added gamma correction tests." into pi-dev
Bryce Lee [Wed, 11 Apr 2018 14:47:10 +0000 (07:47 -0700)]
Merge "Move container focusability logic to ActivityStackSupervisor." into pi-dev am:
90d388aebd
am:
e42716ec39
Change-Id: I0016cd9308418eb4661b3b7baa630a7e6c103e49
Alex Chau [Wed, 11 Apr 2018 14:41:32 +0000 (15:41 +0100)]
Dismiss keyguard when switching user if lockscreen is disabled on new user
Test: Manual
Bug:
77535056
Change-Id: I55d590644b0187c624bca8aef5c21656315ecd87
David Brazdil [Sat, 7 Apr 2018 19:00:35 +0000 (20:00 +0100)]
Greylist methods with varargs and intrinsics
This is due to a related Doclava change.
Bug:
64382372
Test: make
Change-Id: I8fba27a529a83751ab27859b1c1b791ab85786cf
TreeHugger Robot [Wed, 11 Apr 2018 14:38:02 +0000 (14:38 +0000)]
Merge "[WebView Tracing API] documentation fixes." into pi-dev
Bryce Lee [Wed, 11 Apr 2018 14:34:43 +0000 (07:34 -0700)]
Merge "Move container focusability logic to ActivityStackSupervisor." into pi-dev
am:
90d388aebd
Change-Id: I12bd4346131b03d3032e5cd357b332b792132282
Florian Mayer [Wed, 11 Apr 2018 14:29:37 +0000 (07:29 -0700)]
Merge "Address API comments on NetworkStats#getDefaultNetwork." into pi-dev am:
f1657a827f
am:
3975415df5
Change-Id: Ic02215baf0f945d7fe1700e7ba8baf1ef1fd8f60
Bryce Lee [Wed, 11 Apr 2018 14:23:39 +0000 (14:23 +0000)]
Merge "Move container focusability logic to ActivityStackSupervisor." into pi-dev
Robert Berry [Wed, 11 Apr 2018 14:18:23 +0000 (07:18 -0700)]
Merge "Update docs to match encryption requirements" into pi-dev am:
bfa13fe76f
am:
ed11ba6182
Change-Id: I04f1c3d166c8c4cc243608b6bcffddb734dc482a
Florian Mayer [Wed, 11 Apr 2018 14:15:16 +0000 (07:15 -0700)]
Merge "Address API comments on NetworkStats#getDefaultNetwork." into pi-dev
am:
f1657a827f
Change-Id: Ic7356df8144ca41a89bfbf194155bc41058a200d
Amin Shaikh [Wed, 11 Apr 2018 14:11:47 +0000 (07:11 -0700)]
Merge "Fix spacing between signal and text on qs footer." into pi-dev am:
782ee5a7e0
am:
2e3cc06ae9
Change-Id: Ieb6edc2c8e0d742256a29888f57129700249df08
Robert Berry [Wed, 11 Apr 2018 14:10:28 +0000 (07:10 -0700)]
Merge "Update docs to match encryption requirements" into pi-dev
am:
bfa13fe76f
Change-Id: I81f6a613bc8ef123ce33f53bfc6a44092d72a7a9
Beverly Tai [Wed, 11 Apr 2018 14:06:18 +0000 (07:06 -0700)]
Merge "Don't show dev warning toast if notifs for app off" into pi-dev am:
de2e5ce108
am:
7b275f89d0
Change-Id: Id42db44220e8fb12492b63e8a824604ee0d101fe
Jason Monk [Tue, 10 Apr 2018 19:00:18 +0000 (15:00 -0400)]
Fix docs and bug in SliceManager#bindSlice
Test: cts
Change-Id: I812af1eda072c2af0b29454a05ea777d8f4c3c62
Fixes:
73123733
Amin Shaikh [Wed, 11 Apr 2018 14:00:26 +0000 (07:00 -0700)]
Merge "Fix spacing between signal and text on qs footer." into pi-dev
am:
782ee5a7e0
Change-Id: Icabd558931b28dad1353f7e38756f2afc8451893
Anton Philippov [Wed, 11 Apr 2018 13:41:58 +0000 (14:41 +0100)]
Pass app version to agent in adb restore for kv.
This is a temporary solution for P to unblock GTS tests.
Bug:
77852250
Test: manual:
1. adb backup -f saved-wifi-api100.ab -keyvalue com.android.providers.settings
2. adb restore saved-wifi-api100.ab
3. See that SettingsBackupAgent receives appVersionCode in onRestore()
Change-Id: I6092bea570e7e27cb5b72165e9284ad2befc21b6
Florian Mayer [Wed, 11 Apr 2018 13:55:51 +0000 (13:55 +0000)]
Merge "Address API comments on NetworkStats#getDefaultNetwork." into pi-dev
Beverly Tai [Wed, 11 Apr 2018 13:54:56 +0000 (06:54 -0700)]
Merge "Don't show dev warning toast if notifs for app off" into pi-dev
am:
de2e5ce108
Change-Id: I446b950b06ba3c598852eb9f33470d7d773eaa25
Robert Berry [Wed, 11 Apr 2018 13:49:45 +0000 (13:49 +0000)]
Merge "Update docs to match encryption requirements" into pi-dev
timhypeng [Wed, 11 Apr 2018 13:47:35 +0000 (06:47 -0700)]
Merge "Rename onProfileAudioStateChanged() to onAudioModeChanged()" into pi-dev am:
d7b5c6ff7e
am:
17b3a80e10
Change-Id: I202496c09c6021b170d0d6e348dfd868adf60314
TreeHugger Robot [Wed, 11 Apr 2018 13:39:47 +0000 (13:39 +0000)]
Merge "Fix spacing between signal and text on qs footer." into pi-dev
timhypeng [Wed, 11 Apr 2018 13:36:10 +0000 (06:36 -0700)]
Merge "Rename onProfileAudioStateChanged() to onAudioModeChanged()" into pi-dev
am:
d7b5c6ff7e
Change-Id: Ic0b9f042115ced233599427e768c057835cd1a18
Anton Philippov [Wed, 11 Apr 2018 13:34:51 +0000 (06:34 -0700)]
Merge "Fix restore from higher SDKs in SettingsBackupAgent" into pi-dev am:
ff25b5f118
am:
44b32fa5ee
Change-Id: I8f0a16f62ad27c53dd143567c02fc006adeab3f8
Beverly Tai [Wed, 11 Apr 2018 13:30:30 +0000 (13:30 +0000)]
Merge "Don't show dev warning toast if notifs for app off" into pi-dev
Anton Philippov [Wed, 11 Apr 2018 13:22:30 +0000 (06:22 -0700)]
Merge "Fix restore from higher SDKs in SettingsBackupAgent" into pi-dev
am:
ff25b5f118
Change-Id: Icb3885d3f43874c10769664cd76032582df52cf6
TreeHugger Robot [Wed, 11 Apr 2018 13:17:26 +0000 (13:17 +0000)]
Merge "Rename onProfileAudioStateChanged() to onAudioModeChanged()" into pi-dev
Anton Philippov [Wed, 11 Apr 2018 13:08:44 +0000 (13:08 +0000)]
Merge "Fix restore from higher SDKs in SettingsBackupAgent" into pi-dev
Jan Althaus [Wed, 11 Apr 2018 12:44:20 +0000 (05:44 -0700)]
Merge "Minor TextClassifier fixes" into pi-dev am:
b6bba33399
am:
796df0800b
Change-Id: I891b94b7bb0862068eab649e9a2f9987e9d58e63
OSDN Git Service
