OSDN Git Service
zengjing [Mon, 28 May 2018 18:55:55 +0000 (11:55 -0700)]
Merge "Do not setForceUse when a2dp config without change" am:
8a984b9f08
am:
a49ca727be
Change-Id: I9b66aabf3ab2dd8352a9fdb8500384ff6988ab74
zengjing [Mon, 28 May 2018 18:00:16 +0000 (11:00 -0700)]
Merge "Do not setForceUse when a2dp config without change"
am:
8a984b9f08
Change-Id: I644087265717458cb2ffa6bb20d29d90690c0022
Treehugger Robot [Mon, 28 May 2018 17:00:50 +0000 (17:00 +0000)]
Merge "Do not setForceUse when a2dp config without change"
Adrian Roos [Mon, 28 May 2018 14:51:31 +0000 (07:51 -0700)]
Merge "WindowInsets: Never dispatch negative insets" into pi-dev
am:
8997b7e4c9
Change-Id: Ibe1e0f84a649be077a4bea11ac31b9397b964c48
Adrian Roos [Mon, 28 May 2018 14:40:20 +0000 (14:40 +0000)]
Merge "WindowInsets: Never dispatch negative insets" into pi-dev
Jorim Jaggi [Mon, 28 May 2018 12:53:37 +0000 (05:53 -0700)]
Merge "Do not call finishKeyguardDrawn with PWM's mlock" am:
1c3681fe7c
am:
34e4c974aa
Change-Id: I9dcc29873ecb7866343fb733ca700f2a5a757853
Jorim Jaggi [Mon, 28 May 2018 11:59:24 +0000 (04:59 -0700)]
Merge "Do not call finishKeyguardDrawn with PWM's mlock"
am:
1c3681fe7c
Change-Id: I25a21fb44cddbbee9bc251d13a476a5d9fdfbe90
Jorim Jaggi [Mon, 28 May 2018 10:53:30 +0000 (10:53 +0000)]
Merge "Do not call finishKeyguardDrawn with PWM's mlock"
Hongwei Wang [Sun, 27 May 2018 00:06:39 +0000 (17:06 -0700)]
Merge "Dispatch volume key event when mHandleVolumeKeysInWM is set" into pi-dev
am:
6de8729657
Change-Id: Ia61b80bf582f14108417d640ea135ab51988989a
Hongwei Wang [Sat, 26 May 2018 23:55:19 +0000 (23:55 +0000)]
Merge "Dispatch volume key event when mHandleVolumeKeysInWM is set" into pi-dev
Martijn Coenen [Sat, 26 May 2018 09:19:18 +0000 (02:19 -0700)]
Merge "Dump proxy debug info when exceeding proxy limit." into pi-dev
am:
879d09f946
Change-Id: I02d14f682c6476b703d160dab911a3afc14af627
TreeHugger Robot [Sat, 26 May 2018 09:05:14 +0000 (09:05 +0000)]
Merge "Dump proxy debug info when exceeding proxy limit." into pi-dev
Wale Ogunwale [Sat, 26 May 2018 02:43:48 +0000 (19:43 -0700)]
Merge "Added TestApi to ActivityInfo.isTranslucentOrFloating" into pi-dev
am:
9d19487b1c
Change-Id: Ie430137f84f8b6a8d702e4ea5070ded4711da4a8
TreeHugger Robot [Sat, 26 May 2018 02:23:25 +0000 (02:23 +0000)]
Merge "Added TestApi to ActivityInfo.isTranslucentOrFloating" into pi-dev
Winson Chung [Sat, 26 May 2018 00:37:53 +0000 (17:37 -0700)]
Merge "Tweak quickscrub bar visuals" into pi-dev
am:
e2b602018f
Change-Id: Ie1cc36c9aaa35641deac620d7e5df50c9fc4e033
Winson Chung [Sat, 26 May 2018 00:26:59 +0000 (00:26 +0000)]
Merge "Tweak quickscrub bar visuals" into pi-dev
Robert Shih [Fri, 25 May 2018 23:15:40 +0000 (16:15 -0700)]
Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev
am:
300ab58e9a
Change-Id: Ib8fd78e9d876ce986d443a8422330b7d69a44c10
TreeHugger Robot [Fri, 25 May 2018 23:01:53 +0000 (23:01 +0000)]
Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev
Jason Monk [Fri, 25 May 2018 22:26:03 +0000 (15:26 -0700)]
Merge "Final cleanups to permission slices" into pi-dev
am:
64a33d695d
Change-Id: I3256c8ca665ede11bab55072cddb8598c1d3b51b
TreeHugger Robot [Fri, 25 May 2018 22:10:20 +0000 (22:10 +0000)]
Merge "Final cleanups to permission slices" into pi-dev
Android Build Merger (Role) [Fri, 25 May 2018 21:53:50 +0000 (21:53 +0000)]
Merge "Merge "Fix IME displayed behind the notification shade" into pi-dev am:
c0797c85e9" into pi-dev-plus-aosp
Selim Cinek [Fri, 25 May 2018 21:53:16 +0000 (14:53 -0700)]
Merge "Fix IME displayed behind the notification shade" into pi-dev
am:
c0797c85e9
Change-Id: I4adfe6e0f61e934cfd2e422844338cf2984c757b
Bryan Henry [Fri, 25 May 2018 21:53:07 +0000 (14:53 -0700)]
[automerger skipped] Merge "Allow changing signing cert for system apps that use shared users" am:
f98f8a4c6c
am:
cb39c1a9ef -s ours
Change-Id: I6075b3b4ab6d204cce51d55ed86ae9df97ddca9d
Bryan Henry [Fri, 25 May 2018 21:42:16 +0000 (14:42 -0700)]
Merge "Allow changing signing cert for system apps that use shared users"
am:
f98f8a4c6c
Change-Id: Iccd2ec46ab087d2dc31afa255ea8dc9f49897b79
Selim Cinek [Fri, 25 May 2018 21:33:42 +0000 (21:33 +0000)]
Merge "Fix IME displayed behind the notification shade" into pi-dev
Julia Reynolds [Fri, 25 May 2018 21:19:55 +0000 (14:19 -0700)]
Merge "DO NOT MERGE Update volume dialog colors" into pi-dev
am:
aa8391d544
Change-Id: Ib5c23f8f1ad2866ddd796e4a0e7b522734d9e5f5
TreeHugger Robot [Fri, 25 May 2018 21:05:55 +0000 (21:05 +0000)]
Merge "DO NOT MERGE Update volume dialog colors" into pi-dev
Winson Chung [Thu, 24 May 2018 21:21:57 +0000 (14:21 -0700)]
Tweak quickscrub bar visuals
- Thicker asset, scale track slightly on gesture start/end
Bug:
79945202
Test: Quickscrub and see changes
Change-Id: Ic7ae11981ae79cd909d919a326ecc5126cbb399f
Lin Guo [Fri, 25 May 2018 20:30:49 +0000 (13:30 -0700)]
Merge "Apply tint to the Volume Dialog primary and supplement icon" into pi-dev
am:
4651a6cb72
Change-Id: I769a4f5b1d3db8848c82d57fd0931980544c22b3
Selim Cinek [Fri, 25 May 2018 20:21:38 +0000 (13:21 -0700)]
Merge "Fixed the behavior of group conversations when targeting P" into pi-dev
am:
c4e19963f4
Change-Id: I7e5feadc253816852528e06719e136a7cba51c49
Bryan Henry [Fri, 25 May 2018 20:21:23 +0000 (20:21 +0000)]
Merge "Allow changing signing cert for system apps that use shared users"
TreeHugger Robot [Fri, 25 May 2018 20:16:54 +0000 (20:16 +0000)]
Merge "Apply tint to the Volume Dialog primary and supplement icon" into pi-dev
Selim Cinek [Fri, 25 May 2018 20:06:52 +0000 (20:06 +0000)]
Merge "Fixed the behavior of group conversations when targeting P" into pi-dev
Julia Reynolds [Wed, 23 May 2018 13:45:53 +0000 (09:45 -0400)]
DO NOT MERGE Update volume dialog colors
Test: manual
Fixes:
79699643
Change-Id: I73bde7f30a9aad5b7c084d37987f808df342cc75
Jason Monk [Fri, 25 May 2018 19:13:16 +0000 (15:13 -0400)]
Final cleanups to permission slices
- Add icons to the right and shortcut modes
- Add color
- Make sure dialogs are secure
Test: manual
Bug:
79960669
Change-Id: I6d251b0ea5bd3c1b3eed32b184e4aae22c52ffb5
Suprabh Shukla [Fri, 25 May 2018 19:30:07 +0000 (12:30 -0700)]
Merge "Only user whitelist gets allow_while_idle_unrestricted" into pi-dev
am:
3d70d20c88
Change-Id: I4f03288f78bb89a7940f5757373c97ea0ca407db
TreeHugger Robot [Fri, 25 May 2018 19:17:33 +0000 (19:17 +0000)]
Merge "Only user whitelist gets allow_while_idle_unrestricted" into pi-dev
Tracy Zhou [Fri, 25 May 2018 19:06:44 +0000 (12:06 -0700)]
Merge "Do not truncate onboarding tip text." into pi-dev
am:
8ac5fc68a9
Change-Id: I0d60205f76d774d670111981714718611e0dafcf
Robert Shih [Fri, 25 May 2018 18:42:22 +0000 (11:42 -0700)]
Add cleartextTrafficPermitted to MediaFrameworkTest
Bug:
75276616
Test: this
Change-Id: I520950a148658e9f1602e1b4657dd0273bdaf0e2
TreeHugger Robot [Fri, 25 May 2018 18:51:40 +0000 (18:51 +0000)]
Merge "Do not truncate onboarding tip text." into pi-dev
Tracy Zhou [Fri, 25 May 2018 18:17:36 +0000 (11:17 -0700)]
Merge "Support rtl for quick scrub onboarding text." into pi-dev
am:
78766d2901
Change-Id: Ibdaf788a47791bd1b44d557f852f86d0253b393f
Martijn Coenen [Fri, 25 May 2018 17:28:26 +0000 (19:28 +0200)]
Dump proxy debug info when exceeding proxy limit.
If a process gets killed because it sends too many proxies,
dump proxy debug info so we can see what types of interfaces
it sends.
Bug:
71353150
Test: builds, output generated
Change-Id: I3a7787cb3fa73b0b4ad223b18cd79f44e22b9ef5
Tetsutoki Shiozawa [Fri, 25 May 2018 18:12:35 +0000 (11:12 -0700)]
[automerger skipped] Merge "Fix: ConnectivityManager is initialized with a wrong context" am:
4517eacd5d
am:
356edc5fe4 -s ours
Change-Id: Ibdbd1d7b667506ac14b8cc487d17d11f82a993b0
TreeHugger Robot [Fri, 25 May 2018 18:06:07 +0000 (18:06 +0000)]
Merge "Support rtl for quick scrub onboarding text." into pi-dev
Tetsutoki Shiozawa [Fri, 25 May 2018 18:01:09 +0000 (11:01 -0700)]
Merge "Fix: ConnectivityManager is initialized with a wrong context"
am:
4517eacd5d
Change-Id: I0629b33b8cc5e155b4500cc15901985dbf0a31f2
sanryhuang [Fri, 25 May 2018 04:34:31 +0000 (12:34 +0800)]
Fix IME displayed behind the notification shade
The Back key isn't dispatched to IME. Refine the logic of onKeyPreIme.
Test: manual test
Test: atest
Change-Id: I6cf5402e70e91d74e5843beb390b306146159e4d
Fixes:
80250543
Wale Ogunwale [Fri, 25 May 2018 01:25:25 +0000 (18:25 -0700)]
Added TestApi to ActivityInfo.isTranslucentOrFloating
This would be use to determine the right activity state during CTS
test for products that have windowSwipeToDismiss set.
Also, dump ActivityRecord.fullscreen to proto for the same reason.
Bug:
76207986
Bug:
79167358
Test: atest CtsActivityManagerDeviceTestCases:ActivityLifecycleTests
Test: atest CtsActivityManagerDeviceTestCases:ActivityManagerAssistantStackTests
Change-Id: Iadc088e9129be088b8a083ebbafd8d20fe26b673
Treehugger Robot [Fri, 25 May 2018 16:42:59 +0000 (16:42 +0000)]
Merge "Fix: ConnectivityManager is initialized with a wrong context"
Selim Cinek [Wed, 23 May 2018 23:46:05 +0000 (16:46 -0700)]
Fixed the behavior of group conversations when targeting P
Fixes an issue where the group conversation heuristic was still
applied even when the app is targeting P. We're now following
the isGroupConversation completely and only do the migration
for apps targeting < P.
Change-Id: I471d58e8a8f5e6270f0dcce8691d08a2bdd1c582
Fixes:
78450835
Test: add messaging notification, observe correct display
Mihai Popa [Fri, 25 May 2018 16:12:52 +0000 (09:12 -0700)]
Merge "Fix monkey crash in smart selection animation" into pi-dev
am:
1ffdec20b4
Change-Id: Idbc82d56568d65542d189c84954c3c3f7cd7aea9
TreeHugger Robot [Fri, 25 May 2018 15:59:07 +0000 (15:59 +0000)]
Merge "Fix monkey crash in smart selection animation" into pi-dev
Shuzhen Wang [Fri, 25 May 2018 15:40:55 +0000 (08:40 -0700)]
Merge "Camera: Clarify multi-camera id selection logic" into pi-dev
am:
568ccfe0b6
Change-Id: I1e118301f74e407fa2e23557c2a5f1a77882ef18
TreeHugger Robot [Fri, 25 May 2018 15:27:43 +0000 (15:27 +0000)]
Merge "Camera: Clarify multi-camera id selection logic" into pi-dev
Tetsutoki Shiozawa [Mon, 19 Feb 2018 01:24:43 +0000 (10:24 +0900)]
Fix: ConnectivityManager is initialized with a wrong context
ActivityThread#setHttpProxy uses a system context to get
a ConnectivityManager instance. If it's not already cached, the
system service registry will cache this instance initialized
with the system context, and subsequent calls to get this service
will return the bad instance.
This patch uses the application context instead, unless it's
not available for some unlikely reason.
A possible symptom of this issue is to have Bluetooth tethering
failing with a security exception, because it's requested by
the "android" package without system uid.
Merged-In: Ib8815f010883cdb94fcad2cdfb237de39327b20a
Bug:
73572062
Change-Id: Id652c1625194dc73dcbf8dfcad4b4e2e6fbebf4e
Mihai Popa [Fri, 25 May 2018 10:57:17 +0000 (11:57 +0100)]
Fix monkey crash in smart selection animation
In Id65443e93d277c106ea955c867d39e94192cc55d we fixed a monkey crash
happening when the smart selected text had changed while the smart
selection animation was running. However, the change introduced a new
crash, happening when the smart selection result was null. This CL fixes
it, and lets startSelectionActionMode run even when the result is null,
as there seems to be some logic there which should happen in this case.
Bug:
80244201
Test: none
Change-Id: I7f0304446dec85578bdcd5011d2e9ea2737d3c36
(cherry picked from commit
a9d27ea8692dbf6c6def6bd21754af0ad67d1675)
Merged-in: I7f0304446dec85578bdcd5011d2e9ea2737d3c36
Nicolas Geoffray [Fri, 25 May 2018 13:55:59 +0000 (06:55 -0700)]
Merge "Add one telephony API to light grey." into pi-dev
am:
a764186455
Change-Id: I6d797c061dc2b7685bc8892065892b38cd932750
Nicolas Geoffray [Fri, 25 May 2018 13:46:31 +0000 (13:46 +0000)]
Merge "Add one telephony API to light grey." into pi-dev
Nicolas Geoffray [Fri, 25 May 2018 13:43:39 +0000 (06:43 -0700)]
Merge "More light grey apis." into pi-dev
am:
1b32d34457
Change-Id: I5f43a4d569c4965e3530f856d19e51099c616f75
Nicolas Geoffray [Fri, 25 May 2018 13:38:36 +0000 (06:38 -0700)]
Merge "Add SharedPreferencesImpl;->startLoadFromDisk()V to light grey." into pi-dev
am:
83ee75a2de
Change-Id: I3fd7534da5fd815d8a9f3871ef8d0bbda85db7b4
Nicolas Geoffray [Fri, 25 May 2018 13:30:19 +0000 (13:30 +0000)]
Merge "More light grey apis." into pi-dev
Nicolas Geoffray [Fri, 25 May 2018 13:29:55 +0000 (13:29 +0000)]
Merge "Add SharedPreferencesImpl;->startLoadFromDisk()V to light grey." into pi-dev
Adrian Roos [Thu, 24 May 2018 16:20:51 +0000 (18:20 +0200)]
WindowInsets: Never dispatch negative insets
Bug:
80204753
Test: atest ViewRootImplTest
Change-Id: Idace95ae57c6a3a1667b95ce8c3ac7d2bfe06f94
Jiyong Park [Fri, 25 May 2018 11:26:20 +0000 (04:26 -0700)]
[automerger skipped] Merge changes from topic "location_provider" am:
79b473ed7b
am:
77390bf307 -s ours
Change-Id: I5ef31499bd1e21237fa8a1752c035ae8341235b9
Jiyong Park [Fri, 25 May 2018 11:17:49 +0000 (04:17 -0700)]
Merge changes from topic "location_provider"
am:
79b473ed7b
Change-Id: I9a9985fd18db00d510ebae9e0dec69d6647a2332
Nicolas Geoffray [Fri, 25 May 2018 11:01:25 +0000 (04:01 -0700)]
Merge "Add more light grey APIs." into pi-dev
am:
32256ceb22
Change-Id: I1ffe50fb847f8986b41fabe9ee0c41fb72558ed9
TreeHugger Robot [Fri, 25 May 2018 10:49:18 +0000 (10:49 +0000)]
Merge "Add more light grey APIs." into pi-dev
Treehugger Robot [Fri, 25 May 2018 10:04:43 +0000 (10:04 +0000)]
Merge changes from topic "location_provider"
* changes:
Remove FlpHardwareProvider
Create the stubs lib for com.android.location.provider
Rubin Xu [Fri, 25 May 2018 09:56:21 +0000 (02:56 -0700)]
Merge "Add permission check to setAllowOnlyVpnForUids" am:
1fb2ed3de3
am:
1efa51a873
Change-Id: I43efafcb80a85f0cb94037440e66a2568b71af63
Nicolas Geoffray [Fri, 25 May 2018 09:46:32 +0000 (10:46 +0100)]
More light grey apis.
bug:
80270434
Test: m
Change-Id: I4877a782f9f8c0599de189d28df876d60d2c7b3d
Rubin Xu [Fri, 25 May 2018 09:46:33 +0000 (02:46 -0700)]
Merge "Add permission check to setAllowOnlyVpnForUids"
am:
1fb2ed3de3
Change-Id: I3a529eecf98a19c8ab421707fc952b2a56e10f34
Nicolas Geoffray [Fri, 25 May 2018 08:10:55 +0000 (09:10 +0100)]
Add more light grey APIs.
bug:
80256659
Test: m
Change-Id: Ic2a0ecffcd039cb5474625e39264714b9eed768a
Felipe Leme [Fri, 25 May 2018 09:09:38 +0000 (02:09 -0700)]
Merge "New Autofill field: FIELD_AUTOFILL_SESSION_ID" into pi-dev
am:
a278df4aae
Change-Id: I5aec308555c2effc4917d62124b057d6d2ed1744
eddy-sh.chen [Fri, 25 May 2018 08:43:08 +0000 (16:43 +0800)]
Do not call finishKeyguardDrawn with PWM's mlock
Otherwise it may cause a deadlock between
PWM's mlock and WMS's mWindowMap.
Just post the work to the policy handler instead.
Bug:
80279029
Change-Id: Idae333687cf5c88e1893ee216c278b9e6c17dd98
TreeHugger Robot [Fri, 25 May 2018 08:57:23 +0000 (08:57 +0000)]
Merge "New Autofill field: FIELD_AUTOFILL_SESSION_ID" into pi-dev
Treehugger Robot [Fri, 25 May 2018 08:26:34 +0000 (08:26 +0000)]
Merge "Add permission check to setAllowOnlyVpnForUids"
Nicolas Geoffray [Fri, 25 May 2018 08:02:35 +0000 (01:02 -0700)]
Merge "Add some telephony API to light grey." into pi-dev
am:
7e1c36e64b
Change-Id: Ic68f3da20a5bb5dec2fb4c318d642714892415bb
Nicolas Geoffray [Fri, 25 May 2018 08:01:06 +0000 (09:01 +0100)]
Add SharedPreferencesImpl;->startLoadFromDisk()V to light grey.
bug:
80091112
Test: m
Change-Id: Ia7c0cf66408fb241b029778d248dd3b7e324727a
Nicolas Geoffray [Fri, 25 May 2018 07:50:22 +0000 (07:50 +0000)]
Merge "Add some telephony API to light grey." into pi-dev
Jiyong Park [Thu, 8 Mar 2018 07:43:07 +0000 (16:43 +0900)]
Remove FlpHardwareProvider
After Treble's FLP merge into GNSS HAL, the FlpHardwareProvider is just
an empty shell. Removing FusedLocation and/or Flp + Hardware classes
altogether.
Bug:
35726697
Test: m -j
Test: Open Google Map and then walk around. The dot moves as I walk.
Merged-In: I7f413e38b57424e8ebb9d7d14d94f145a48d10f8
Change-Id: I7f413e38b57424e8ebb9d7d14d94f145a48d10f8
(cherry picked from commit
4cc3a1c056f69ac4da1dc5055c36b7357e9f673c)
Jiyong Park [Tue, 27 Feb 2018 13:00:23 +0000 (22:00 +0900)]
Create the stubs lib for com.android.location.provider
com.android.location.provider.stubs is the stubs library for the shared
library com.android.location.provider. The stubs library is intended to
provide the stable set of APIs to the apps implementing location
provider.
Without the stubs library, apps had to directly link to the shared
library which is built without Android SDK and exposes private APIs that
are not intended to be used by apps. This also has been causing the
lin-type check warnings when the shared lib is used by apps built with
SDK; apps built with SDK is not allowed to link to lib built without
SDK. This has been reported as warnings but will soon be errors. Now
such apps are required to link to the stubs lib, which is built with
SDK.
While building the stubs library, following APIs are made hidden because
they are exposing private APIs from the Android platform.
1) Activity* classes are removed from the API, as they are not intended
to be used by apps since O.
2) GeocodeProvider and GeofenceProvider are removed from the API.
3) LocationProvider.mLocationManager is removed as it is exposing the
private symbol ILocationProvider
4) ProviderPropertiesUnbundle.getProviderProperties are removed from the
API as it is exposing the private symbol ProviderProperties.
5) The constructor of ProviderRequestUnbundled is removed since the
class is intended to be instantiated by the service.
Bug:
71420593
Test: m -j com.android.location.provider.stubs
Merged-In: I20aba7e9ca9c3adc75db241f37a55f0d657f3ced
Change-Id: I20aba7e9ca9c3adc75db241f37a55f0d657f3ced
(cherry picked from commit
eee99986c8021d6825f99a25434725fccf7b2b12)
Felipe Leme [Thu, 24 May 2018 17:41:48 +0000 (10:41 -0700)]
New Autofill field: FIELD_AUTOFILL_SESSION_ID
This field contains the autofill session id (Thank You, Captain Obvious!), which
is useful to correlate autofill metrics that are not logged on
AUTOFILL_REQUEST.
Test: atest CtsAutoFillServiceTestCases # to make sure it didn't break anything
Test: manually run some test and watched
'adb shell logcat -b events | grep sysui'. Example:
[757,913,758,4,806,android.autofillservice.cts,871,android.autofillservice.cts.LoginActivity,914,2,915,2,1456,-
2045861404
Fixes:
80093094
Merged-In: If4b1c9ab616b2ba580745096894997eb7edb3e34
Change-Id: If4b1c9ab616b2ba580745096894997eb7edb3e34
Remi NGUYEN VAN [Fri, 25 May 2018 05:53:53 +0000 (22:53 -0700)]
[automerger skipped] Merge "Use AI_ADDRCONFIG for most DNS requests" am:
b19a838f47
am:
aa6ddd6685 -s ours
Change-Id: Ie19e3ef1c704f9318f067c03ccc75fdf6727fa89
Remi NGUYEN VAN [Fri, 25 May 2018 05:43:35 +0000 (22:43 -0700)]
Merge "Use AI_ADDRCONFIG for most DNS requests"
am:
b19a838f47
Change-Id: I452da6fffe8eddedf0082c8ca7602566c82f6ebe
Remi NGUYEN VAN [Fri, 25 May 2018 05:25:33 +0000 (22:25 -0700)]
[automerger skipped] Merge "Migrating remaining core networking tests to Junit4" am:
96dbac0c5c
am:
a3c2022836 -s ours
Change-Id: I7df578d4f89b94e50d9f3798fc675b6a93477200
Tracy Zhou [Fri, 25 May 2018 05:21:06 +0000 (22:21 -0700)]
Support rtl for quick scrub onboarding text.
Change-Id: I1f2073e1c24a24aa5ddfd061a6e8b0eaef40335c
Fixes:
80257508
Test: Manual test
Aarthi Balachander [Fri, 25 May 2018 04:45:23 +0000 (21:45 -0700)]
Merge "Add missing copyright messages Test: Tested on Mojave Bug:
80266597 Change-Id: I1a2e712adabe8872f7c440e8e2c15787aea7aa98" into pi-dev
am:
9aafb212c5
Change-Id: I9f9133a555826c46482ca5dee27b595d4a720bf9
Remi NGUYEN VAN [Fri, 25 May 2018 04:37:04 +0000 (21:37 -0700)]
Merge "Migrating remaining core networking tests to Junit4"
am:
96dbac0c5c
Change-Id: I3d5c8274f76d00c61a384213ade1fae97c96ae24
TreeHugger Robot [Fri, 25 May 2018 04:24:29 +0000 (04:24 +0000)]
Merge "Add missing copyright messages Test: Tested on Mojave Bug:
80266597 Change-Id: I1a2e712adabe8872f7c440e8e2c15787aea7aa98" into pi-dev
Remi NGUYEN VAN [Fri, 25 May 2018 03:28:05 +0000 (03:28 +0000)]
Merge "Use AI_ADDRCONFIG for most DNS requests"
Remi NGUYEN VAN [Fri, 25 May 2018 03:27:39 +0000 (03:27 +0000)]
Merge "Migrating remaining core networking tests to Junit4"
zengjing [Fri, 25 May 2018 03:15:20 +0000 (11:15 +0800)]
Do not setForceUse when a2dp config without change
When device connected with wired headset and without any bluetooth
connection, APP may call MediaRouter to setForceUse to set FOR_MEDIA
with FORCE_SPEAKER, then sound be output to SPEAKER. In this case,
if setBluetoothA2dpOn(false) was called, FOR_MEDIA will be set with
FORCE_NONE and sound be output to wird headset.
The issue discussed above occurred on our device. We developed an FM radio APP.
Beforce work, wired headset must be plugged in to be used as antennas. Then we
setForceUse FOR_MEDIA to FORCE_SPEAKER, and audio stream was output to speaker.
At this moment, if we play other sound (such as ScreenCapture sound),
MediaRouterService will detected audio playbacked state changed. Because FM Audio
was not monitor by AudioPlaybackMonitor, there was not any audio playback active.
So, restoreBluetoothA2dp was called in the function of onAudioPlayerActiveStateChanged,
which call AudioService.setBluetoothA2dpOn(false). As a result sound was switch to headset.
There are two solutions to fix our issue.
1) Check a2dp state before setBluetoothA2dpOn in MediaRouterService::restoreBluetoothA2dp,
if a2dp state does not change, setBluetoothA2dpOn should not be called
2) Check a2dp state before setForceUse in AudioService::setBluetoothA2dpOn,
if a2dp state does not change, setForceUse should not be called
Consdering that setBluetoothA2dpOn may be called by other method, we try to fix it
with the second one.
Test: NA
Change-Id: I3a2e64e7d73d9aa9539176fea556feb433cb7211
Signed-off-by: zengjing <zengjing@xiaomi.com>
Suprabh Shukla [Fri, 25 May 2018 01:38:50 +0000 (18:38 -0700)]
Only user whitelist gets allow_while_idle_unrestricted
Due to earlier refactorings, now allow-in-power-save-except-idle apps
are getting the flag ALLOW_WHILE_IDLE_UNRESTRICTED, which should not
happen. Restricting to user whitelisted app ids as was the case in O.
Test: atest com.android.server.AppStateTrackerTest
atest android.alarmmanager.cts.AppStandbyTests
Also, manually,
adb shell cmd deviceidle whitelist +<package-name>
Then verify the app id appears in App state tracker dump in
adb shell dumpsys alarm
Bug:
74773710
Change-Id: I6fdce33446e1374c6672ce98769aa8b5844effa9
TreeHugger Robot [Fri, 25 May 2018 02:26:18 +0000 (02:26 +0000)]
Merge "screencap: return instead of _exit." into pi-dev-plus-aosp
Jason Monk [Fri, 25 May 2018 02:03:30 +0000 (19:03 -0700)]
Merge "Follow supportlib changes in SliceManager" into pi-dev
am:
96910a6dc2
Change-Id: I553c13a822d3944bd855575638680a29eedfba2e
Felipe Leme [Fri, 25 May 2018 01:56:49 +0000 (18:56 -0700)]
Merge "Added the class name of activity being autofilled on (most) autofill metrics." into pi-dev
am:
41a60f4033
Change-Id: Ie09496de119a9e1777218466a250ddbf3867a630
Felipe Leme [Fri, 25 May 2018 01:52:23 +0000 (18:52 -0700)]
Merge "Merged many autofill session metrics into AUTOFILL_REQUEST:" into pi-dev
am:
94594d1290
Change-Id: Ic233280a9f2272732d81021311b43979dcbbe691
Mike Digman [Fri, 25 May 2018 01:23:09 +0000 (18:23 -0700)]
Merge "Tweak new rotate icon and motion" into pi-dev
am:
a9050275ba
Change-Id: Ibda7cf39ebb2533f1b46a69ed45cf4907f47d11b
Jason Monk [Fri, 25 May 2018 01:21:35 +0000 (01:21 +0000)]
Merge "Follow supportlib changes in SliceManager" into pi-dev
Steven Moreland [Fri, 25 May 2018 00:48:28 +0000 (17:48 -0700)]
screencap: return instead of _exit.
_exit was being used instead of return in order to
work around a static destructor issue that has been
fixed.
Bug:
77934844
Test: screencap (and it doesn't crash)
Change-Id: I5dc25b0af5099993a94705ac9c7b439e68432824
TreeHugger Robot [Fri, 25 May 2018 00:55:42 +0000 (00:55 +0000)]
Merge "Added the class name of activity being autofilled on (most) autofill metrics." into pi-dev