392511 Commits

Author SHA1 Message Date
TreeHugger Robot
a87656a7b5 Merge "Tweak RenderNode final/constructor API" 2018-11-10 06:31:40 +00:00
TreeHugger Robot
5a19fd430e Merge "Fix system crash in Atms.notifyKeyguardFlagsChanged." 2018-11-10 05:34:28 +00:00
TreeHugger Robot
cc88db5a9d Merge "Add global property to store opt-in application package name." 2018-11-10 04:26:23 +00:00
Fan Zhang
08f7dbbc75 Merge "Logging clean up: remove a logging API that nobody calls." 2018-11-10 03:32:52 +00:00
TreeHugger Robot
7f699d4303 Merge "Fix TextViewPRecomputedTextPerfTest" 2018-11-10 02:24:33 +00:00
Wang, ArvinX
0740d13e03 Merge "Unable to input PIN with hardware keyboard" am: b8740842e0
am: 7e4d381a48

Change-Id: I4805c68c9d3ad609754631890f076a2ba2d2bb6c
2018-11-09 17:49:27 -08:00
Svetoslav Ganov
d641d64ab4 Merge "Allow adopting a subset of shell permissions" 2018-11-10 01:10:31 +00:00
TreeHugger Robot
1045456b95 Merge "AM: Fix deadlock when calling AMS from ATMS/WM" 2018-11-10 01:09:26 +00:00
Mady Mellor
d752d37055 Merge "Add notion of bubble to NotificationData" 2018-11-10 01:07:42 +00:00
Tej Singh
719a8643db Merge "Thermal shutdown fix: cool down on writing to disk" into pi-dev am: 0cc63ef090
am: 6752e11cdc

Change-Id: I57fe90e8411b6131cec4e86507c70fea25db9670
2018-11-09 17:03:50 -08:00
Seigo Nonaka
d39ded7376 Fix TextViewPRecomputedTextPerfTest
Bug: N/A
Test: manually
Change-Id: I22c135b246ce288f1729b1622e4307d68af6b61a
2018-11-09 17:03:37 -08:00
Seigo Nonaka
06dfab0136 Update API doc of Typeaface.setSystemFallback
Bug: 116116764
Test: N/A
Change-Id: I97ebdcfd8d4b4efb0a1d9e3729f74fe7fba96b12
2018-11-09 17:02:36 -08:00
Jong Wook Kim
3b0ed310d1 [automerger skipped] Merge "Add WIFI_ENABLED and WIFI_DISABLED to StaEvent" into pi-dev am: f3375f360e
am: 358ff5d2bf  -s ours

Change-Id: I2bdc2cd9dd87000e9273cac8e00438477ad739e2
2018-11-09 16:58:35 -08:00
Wang, ArvinX
7e4d381a48 Merge "Unable to input PIN with hardware keyboard"
am: b8740842e0

Change-Id: Ia295f2f9f12738ef944a775c2149b4e3f3ded9d4
2018-11-09 16:58:25 -08:00
Robert Carr
415e6f949f [automerger skipped] Merge "DO NOT MERGE Make stop complete notification call in to ActivityManager blocking." into pi-dev am: b71d950932
am: e840014762  -s ours

Change-Id: I6fc755e991b74bb3b3b1dd05b2235339fb3bfe37
2018-11-09 16:53:36 -08:00
Tejinder Singh
bb9790c177 Merge "Pixel Thermal Throttling: fix throttling constants." into pi-dev am: 3ebd957c25
am: ba7af6259d

Change-Id: Ie63d0816715c4dd555258152f1934c3535c47c84
2018-11-09 16:52:41 -08:00
Chenbo Feng
8c74cdfb2f Merge "Rename android bpf library" am: cfcb33cb32 am: 0ba8701f5c
am: d7a976a55c

Change-Id: I26016ed8cd06f7d76681edc03ee16a139bc8a569
2018-11-09 16:47:05 -08:00
Todd Kennedy
f724b82a08 [automerger skipped] Merge "Revert "Fix the icon overlay after density change"" into pi-dev am: e59ce289b7 -s ours
am: aefe6b57a8

Change-Id: I38647c664ccfada3acdb067a53b153a1ddd9da68
2018-11-09 16:40:24 -08:00
Dongwon Kang
ee42cb2fc3 MediaPlayer2: remove AudioManager private API usage
Private API AudioManager.getDevicesStatic() is being used in
MediaPlayer2 for conversion between id <=> AudioDeviceInfo.
This conversion was added to talk with internal native AudioTrack API,
but in MediaPlayer2 since we will use public java AudioTrack API,
the given AudioDeviceInfo can be directly passed to java AudioTrack
instance.

Test: CtsMediaTestCases:android.media.cts.RoutingTest
Bug: 112767549
Change-Id: I03f01d17ef10e4edb074a160c877ca3aa711cbe1
2018-11-09 16:38:23 -08:00
Mady Mellor
6cb20df2a5 Add notion of bubble to NotificationData
- indicate if an entry is a bubble
- indicate if an entry is a bubble that has been dismissed

Test: none
Bug: 111236845
Change-Id: I81a3ed92d438eb849995f80ed2ef2a3995c1cefe
2018-11-09 16:37:19 -08:00
Todd Kennedy
6497f530f9 [automerger skipped] Merge "Revert "resolve merge conflicts of 0cc0d229d0f590fe84c1b7aa8cc8fbf188d8a787 to pi-dev-plus-aosp"" into pi-dev-plus-aosp
am: 2d80eb4425  -s ours

Change-Id: I381f1a73ff73013ed4d200d77ea50338b9b49908
2018-11-09 16:35:31 -08:00
Varun Shah
25eb63ac4a Merge "Exposes Intent.METADATA_SETUP_VERSION as SystemApi for SUW." 2018-11-10 00:23:56 +00:00
Treehugger Robot
b8740842e0 Merge "Unable to input PIN with hardware keyboard" 2018-11-10 00:05:38 +00:00
Android Build Merger (Role)
79f74661f4 Merge "[automerger skipped] Merge "resolve merge conflicts of 0cc0d229d0f590fe84c1b7aa8cc8fbf188d8a787 to pi-dev-plus-aosp" into pi-dev-plus-aosp am: 7a6f5c4b01 -s ours" 2018-11-09 23:58:12 +00:00
Selim Cinek
5b7fd8b15d [automerger skipped] Merge "resolve merge conflicts of 0cc0d229d0f590fe84c1b7aa8cc8fbf188d8a787 to pi-dev-plus-aosp" into pi-dev-plus-aosp
am: 7a6f5c4b01  -s ours

Change-Id: I9b32f9ab08e8790011d379b7a3ba0ab7f9d09488
2018-11-09 15:57:44 -08:00
Adam He
84d49aa8c8 Merge "Added 7th argument to pooled lambdas" 2018-11-09 23:56:03 +00:00
TreeHugger Robot
a737061a3f Merge "Update javadoc for carrier phase alignment in getAccumulatedDeltaRangeMeters" 2018-11-09 23:47:28 +00:00
TreeHugger Robot
43c453a165 Merge "Add device type to falsing data for normalization purposes." 2018-11-09 23:45:41 +00:00
Brad Ebinger
30858dc7ac Merge "Expose SRVCC state changes as @SystemAPI" am: c10b96899e
am: 657343b811

Change-Id: I43bdae25b265586db2417e7f512eac04800de047
2018-11-09 15:27:27 -08:00
John Reck
e5bc78ff9d Tweak RenderNode final/constructor API
Bug: 112709971
Test: builds
Change-Id: Idc558645015078b923bd94abc320b2a65d8d2c6b
2018-11-09 15:18:43 -08:00
Brad Ebinger
657343b811 Merge "Expose SRVCC state changes as @SystemAPI"
am: c10b96899e

Change-Id: I30ee7cf5f6125c83938314f77f58540df2240efc
2018-11-09 15:16:15 -08:00
TreeHugger Robot
2f6bfcbd6f Merge "Calling opChanged on package suspend / unsuspend" 2018-11-09 23:02:59 +00:00
Brad Ebinger
c10b96899e Merge "Expose SRVCC state changes as @SystemAPI" 2018-11-09 23:02:38 +00:00
Calvin Pan
eee096197b [automerger skipped] Merge "Add CarrierId column in TelephonyProvider" am: 1df5ca6a71 am: dfed97ba6d
am: 41ad850c96  -s ours

Change-Id: I10808910c9bd91367cb73b43f765ead7c4310e0a
2018-11-09 14:54:06 -08:00
Android Build Merger (Role)
c8e008b0b4 Merge "Merge "Introduce getRssi() in CellSignalStrengthLte" am: 5bdf255e0d am: e819bd7a1e" into pi-dev-plus-aosp 2018-11-09 22:48:04 +00:00
Fan Zhang
0921e2cf39 Logging clean up: remove a logging API that nobody calls.
Bug: 117860032
Test: rebuild
Change-Id: I984320b7196369331aff783673a5981a7a89f3d2
2018-11-09 14:47:47 -08:00
Shuo Qian
61db02b01a Merge "Introduce getRssi() in CellSignalStrengthLte" am: 5bdf255e0d
am: e819bd7a1e

Change-Id: I77c5ba0bf87afde281473134a306595c052820cc
2018-11-09 14:47:08 -08:00
Hai Zhang
4ef21d0308 Add RoleManager into SystemServiceRegistry.
This change adds RoleManager into SystemServiceRegistry so that
Context.getSystemService() can work properly for RoleManager.

Bug: 110557011
Test: build
Change-Id: I81b7ed87e71f0deee090252f5bedf42eb79806aa
2018-11-09 14:43:51 -08:00
Tej Singh
6752e11cdc Merge "Thermal shutdown fix: cool down on writing to disk" into pi-dev
am: 0cc63ef090

Change-Id: Ieb9fe51c3a729413a1aa7f0c044246eb1c7c836c
2018-11-09 14:41:26 -08:00
Android Build Merger (Role)
f49437626a Merge "Merge "Remove android.icu.... classes from light grey list" am: c6b17ad431 am: 1519c387e7 am: f82d01d16f" 2018-11-09 22:32:11 +00:00
Paul Duffin
5d304e4c7f Merge "Remove android.icu.... classes from light grey list" am: c6b17ad431 am: 1519c387e7
am: f82d01d16f

Change-Id: I1dfb95909fd5976b551cf705344bcab1e7d1c489
2018-11-09 14:31:29 -08:00
Android Build Merger (Role)
9abb06e83d Merge "Merge "DexLoadReporter needs to handle arbitrary class loaders." am: f2d5ace011 am: 1e29264790 am: 0a0559c0ce" 2018-11-09 22:24:36 +00:00
Alan Stokes
07317d001c Merge "DexLoadReporter needs to handle arbitrary class loaders." am: f2d5ace011 am: 1e29264790
am: 0a0559c0ce

Change-Id: I3a89a9da435cf557fd296066df7b9c5b316e87c2
2018-11-09 14:23:00 -08:00
Shuo Qian
e819bd7a1e Merge "Introduce getRssi() in CellSignalStrengthLte"
am: 5bdf255e0d

Change-Id: I39c693f5d463ab1d315c94802a3e9b17923c6508
2018-11-09 14:21:37 -08:00
Android Build Merger (Role)
36652d55a9 Merge "Merge "Use spy in PermissionMonitorTest." am: df01b11de1 am: 999733c5fa am: 9c10dcc0f1" 2018-11-09 22:17:09 +00:00
Junyu Lai
15a1266b17 Merge "Use spy in PermissionMonitorTest." am: df01b11de1 am: 999733c5fa
am: 9c10dcc0f1

Change-Id: I1478b9c2bb12b6bfd161be99c5faa7aec76d9a7f
2018-11-09 14:16:41 -08:00
Suprabh Shukla
9b2fb2ad7e Merge "Removing local service in test setup" 2018-11-09 22:16:10 +00:00
Android Build Merger (Role)
6f06976e67 Merge "Merge "Fix adb shell cmd activity get-config --proto --device fail" am: c0dd0d6648 am: bb5384dbd0 am: f604b8b688" 2018-11-09 22:10:56 +00:00
Sudheer Shanka
c9df31429a Merge "Fix adb shell cmd activity get-config --proto --device fail" am: c0dd0d6648 am: bb5384dbd0
am: f604b8b688

Change-Id: If0cddc5548552e1f78702089da8c6e6fc461814d
2018-11-09 14:10:17 -08:00
Shuo Qian
5bdf255e0d Merge "Introduce getRssi() in CellSignalStrengthLte" 2018-11-09 22:07:50 +00:00