OSDN Git Service
TreeHugger Robot [Thu, 18 Jan 2018 19:20:55 +0000 (19:20 +0000)]
Merge "Prevent getting from transit when interesting window is exiting"
TreeHugger Robot [Thu, 18 Jan 2018 19:10:28 +0000 (19:10 +0000)]
Merge changes Iaeb8d9c2,Ifa83ce1d
* changes:
Fix notification sorting.
Remove all caps style
TreeHugger Robot [Thu, 18 Jan 2018 19:02:44 +0000 (19:02 +0000)]
Merge "AudioAttributes: note that AAudio.h should sync"
TreeHugger Robot [Thu, 18 Jan 2018 18:42:18 +0000 (18:42 +0000)]
Merge "Dump state of GnssMeasurement & NavMsg requests"
Mike Digman [Thu, 18 Jan 2018 18:39:42 +0000 (18:39 +0000)]
Merge "Make rotate QS tile function as on/off to match circle styling"
TreeHugger Robot [Thu, 18 Jan 2018 18:27:19 +0000 (18:27 +0000)]
Merge "Check if UserState is null in stopGuestOrEphemeralUserIfBackground"
Android Build Merger (Role) [Thu, 18 Jan 2018 18:21:29 +0000 (18:21 +0000)]
Merge "Merge "Added APIs for Connection-oriented channels" am:
e1992384e0 am:
288915bedc am:
39f133eed2"
TreeHugger Robot [Thu, 18 Jan 2018 18:21:25 +0000 (18:21 +0000)]
Merge "DisplayCutout: Actually reload displays when resource overlays change"
Andrew Zeng [Thu, 18 Jan 2018 18:20:30 +0000 (18:20 +0000)]
Merge "Set windowElevation to 0 on watch dialogs."
Stanley Tng [Thu, 18 Jan 2018 18:19:25 +0000 (18:19 +0000)]
Merge "Added APIs for Connection-oriented channels" am:
e1992384e0 am:
288915bedc
am:
39f133eed2
Change-Id: I79afa5ef129790588dca91266f79a6125edefd06
Stanley Tng [Thu, 18 Jan 2018 18:08:37 +0000 (18:08 +0000)]
Merge "Added APIs for Connection-oriented channels" am:
e1992384e0
am:
288915bedc
Change-Id: Iaf2aa40e8e6e2621c146fcabe0f46c3dd1bfedc4
Rohan Shah [Thu, 18 Jan 2018 18:05:01 +0000 (18:05 +0000)]
Merge "Move the signal traffic indicators out of the QS icon circle bounds"
Winson Chung [Thu, 18 Jan 2018 18:01:55 +0000 (18:01 +0000)]
Merge "Added logging for OverviewProxyService"
Stanley Tng [Thu, 18 Jan 2018 17:59:19 +0000 (17:59 +0000)]
Merge "Added APIs for Connection-oriented channels"
am:
e1992384e0
Change-Id: If7cb99a59aee8640f6dddd96f2388e2a5284df45
TreeHugger Robot [Thu, 18 Jan 2018 17:56:39 +0000 (17:56 +0000)]
Merge "consolidate subsystem sleep state atoms"
Andrew Sapperstein [Thu, 18 Jan 2018 17:49:33 +0000 (17:49 +0000)]
Merge "Ignore first crash dialog."
TreeHugger Robot [Thu, 18 Jan 2018 17:44:37 +0000 (17:44 +0000)]
Merge "Use RecoverySession object to hide session IDs (redux)"
TreeHugger Robot [Thu, 18 Jan 2018 17:41:35 +0000 (17:41 +0000)]
Merge "Put contacts/calendar providers in except-idle whitelist"
Petr Cermak [Thu, 18 Jan 2018 17:39:34 +0000 (17:39 +0000)]
Merge "Add "results source" parameter to RemoteInput"
Phil Burk [Wed, 17 Jan 2018 23:01:43 +0000 (15:01 -0800)]
AudioAttributes: note that AAudio.h should sync
Usage and other attributes may need to be added to AAudio.
Bug:
68052449
Test: just a comment
Change-Id: I6858ef22e437cbd1f9c31142516eca4705422fa6
Peiyong Lin [Thu, 18 Jan 2018 16:51:48 +0000 (16:51 +0000)]
Merge "[GLUtils] Use GL_* types for FP16 bitmap."
TreeHugger Robot [Thu, 18 Jan 2018 16:50:31 +0000 (16:50 +0000)]
Merge "Add adb command to get max running users"
Alex Chau [Thu, 18 Jan 2018 16:07:36 +0000 (16:07 +0000)]
Check if UserState is null in stopGuestOrEphemeralUserIfBackground
- UserState may be removed from mStartedUsers if it has already been stopped
Bug:
72133858
Test: Manually create secondary user, and exit the user in SetupWizard
Change-Id: I92783f89a9d4de9a7eca81e688b4e115c2f5535a
Treehugger Robot [Thu, 18 Jan 2018 16:42:33 +0000 (16:42 +0000)]
Merge "Added APIs for Connection-oriented channels"
TreeHugger Robot [Thu, 18 Jan 2018 16:21:25 +0000 (16:21 +0000)]
Merge "Don't bind netpolicy right away from batterystats"
Adrian Roos [Wed, 17 Jan 2018 11:54:50 +0000 (12:54 +0100)]
DisplayCutout: Actually reload displays when resource overlays change
This allows the DisplayManager to pick up changes to the
DisplayCutout resource, which is used to implement emulation
of the overlay.
Bug:
65689439
Test: adb shell overlay enable ...; verify cutout is picked up immediately and not only after toggling the display
Change-Id: I22c32802859d7c8cc373cbb8f17e41cdaf84c844
TreeHugger Robot [Thu, 18 Jan 2018 16:02:32 +0000 (16:02 +0000)]
Merge "Fix NPE in ActivityStack.ensureActivitiesVisibleLocked"
Bryce Lee [Thu, 18 Jan 2018 15:49:15 +0000 (15:49 +0000)]
Merge "Disallow starting activities without new task from non-activity context."
TreeHugger Robot [Thu, 18 Jan 2018 15:34:28 +0000 (15:34 +0000)]
Merge changes Ie2ec98d9,I81ce2bef
* changes:
Make ImageDecoder return animated Drawables
Ensure that PostProcess Canvas is released
Kenny Guy [Thu, 18 Jan 2018 15:18:08 +0000 (15:18 +0000)]
Merge "Add more brightness config details to dumpsys"
Alex Chau [Tue, 16 Jan 2018 15:01:15 +0000 (15:01 +0000)]
Add adb command to get max running users
Bug:
72033601
Test: New command is working
Change-Id: I38746a2c03a6da35e7d8a149e1fb0b3604234dbc
TreeHugger Robot [Thu, 18 Jan 2018 15:13:19 +0000 (15:13 +0000)]
Merge "Priority only DND updates"
Robert Berry [Thu, 18 Jan 2018 12:53:29 +0000 (12:53 +0000)]
Use RecoverySession object to hide session IDs (redux)
Session IDs are an implementation detail that the framework can (and should)
abstract away. This was previously reverted due to breaking master.
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I4427c818348c054ada39d799b6da3b739f27eba9
Julia Reynolds [Thu, 18 Jan 2018 14:25:44 +0000 (09:25 -0500)]
Fix notification sorting.
Calls are now appropriately sorted.
Test: runtest systemui-notification
Change-Id: Iaeb8d9c2d58c0bfdf3fdeaa9fe7be86f9ab05189
Fixes:
72145403
TreeHugger Robot [Thu, 18 Jan 2018 14:17:14 +0000 (14:17 +0000)]
Merge "Add hint to indicate 'see more' type content"
Wale Ogunwale [Thu, 18 Jan 2018 14:15:45 +0000 (06:15 -0800)]
Fix NPE in ActivityStack.ensureActivitiesVisibleLocked
Follow-up to ag/
3345710 where we add call to the display object.
It is possible for ensureActivitiesVisibleLocked to be called
when the stack has been removed from the display and no longer
has any tasks. So, we need to check if the stack is attached to
the display before trying to access it.
Change-Id: I9d7c3d00c1af1813b2c408339188fcef2c1a1a6f
Fixes:
72107481
Test: manual
Julia Reynolds [Wed, 17 Jan 2018 20:27:44 +0000 (15:27 -0500)]
Remove all caps style
Test: manual
Change-Id: Ifa83ce1daa9dab5a29adabd27ceee066b19a22b1
Robin Lee [Thu, 18 Jan 2018 13:34:20 +0000 (14:34 +0100)]
Don't bind netpolicy right away from batterystats
batteryservice is a 'core' service
netpolicy is an 'other' service
Trying to bind to it straight away fails and leads to a series of
scary Log.wtf messages during boot.
Bug:
72120141
Test: adb logcat -b all
Change-Id: Iad85eaa4b0ec48eb572c22028aca8bd7847fb678
Robert Berry [Thu, 18 Jan 2018 12:24:06 +0000 (12:24 +0000)]
Merge "Revert "Use RecoverySession object to hide session IDs""
Robert Berry [Thu, 18 Jan 2018 12:22:38 +0000 (12:22 +0000)]
Revert "Use RecoverySession object to hide session IDs"
This reverts commit
988c55ce67459553bad517426a924d06a89b059f.
Reason for revert: broke some tests
Change-Id: Ib43099aebc8ff025e052337475bab13445da74eb
TreeHugger Robot [Thu, 18 Jan 2018 12:20:37 +0000 (12:20 +0000)]
Merge "Fix extra space in Suggestions Popup"
TreeHugger Robot [Thu, 18 Jan 2018 11:55:35 +0000 (11:55 +0000)]
Merge "Fixing incorrect doc string"
TreeHugger Robot [Thu, 18 Jan 2018 11:19:24 +0000 (11:19 +0000)]
Merge "Proto change for dimension from condition."
TreeHugger Robot [Thu, 18 Jan 2018 11:11:40 +0000 (11:11 +0000)]
Merge changes I73f54855,I69d3a7c7,I32141ecf
* changes:
Fixed an issue where the notification wouldn't go away
Fixed an issue where the action bar below wasn't rounded
Improved the experience when sending multiple messages
TreeHugger Robot [Thu, 18 Jan 2018 11:08:33 +0000 (11:08 +0000)]
Merge "Prevent quick scrub when dragging up"
TreeHugger Robot [Thu, 18 Jan 2018 11:08:26 +0000 (11:08 +0000)]
Merge "Update the VaultParams encoding to reflect the recent change in the format of vault_handle"
TreeHugger Robot [Thu, 18 Jan 2018 10:59:21 +0000 (10:59 +0000)]
Merge "Remove strings for wifi aggressive handover"
TreeHugger Robot [Thu, 18 Jan 2018 10:56:28 +0000 (10:56 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 18 Jan 2018 10:53:27 +0000 (10:53 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 18 Jan 2018 10:46:32 +0000 (10:46 +0000)]
Merge "Make sure to mutex around job-set iteration"
Android Build Merger (Role) [Thu, 18 Jan 2018 10:41:00 +0000 (10:41 +0000)]
Merge "Merge "Javadoc fixes to Time" am:
b3c2efc615 am:
b51c638a6c am:
90a56a59d5"
Neil Fuller [Thu, 18 Jan 2018 10:40:42 +0000 (10:40 +0000)]
Merge "Javadoc fixes to Time" am:
b3c2efc615 am:
b51c638a6c
am:
90a56a59d5
Change-Id: I62545bdd0604ee0911249abd7628c99868093c77
TreeHugger Robot [Thu, 18 Jan 2018 10:40:24 +0000 (10:40 +0000)]
Merge "Use RecoverySession object to hide session IDs"
Annie Meng [Thu, 18 Jan 2018 10:34:07 +0000 (10:34 +0000)]
Merge "Rename Robo tests to BackupManagerServiceTest"
Neil Fuller [Thu, 18 Jan 2018 10:31:35 +0000 (10:31 +0000)]
Merge "Javadoc fixes to Time" am:
b3c2efc615
am:
b51c638a6c
Change-Id: Ifea3eb9d25754155681b1f74096eacac1fa0b259
TreeHugger Robot [Thu, 18 Jan 2018 10:27:57 +0000 (10:27 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 18 Jan 2018 10:26:44 +0000 (10:26 +0000)]
Merge "KeyStore: Remove duplicate method"
Neil Fuller [Thu, 18 Jan 2018 10:26:13 +0000 (10:26 +0000)]
Merge "Javadoc fixes to Time"
am:
b3c2efc615
Change-Id: I9793670f518d15fc42caa01a519c33e451998a77
TreeHugger Robot [Thu, 18 Jan 2018 10:20:39 +0000 (10:20 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 18 Jan 2018 10:09:09 +0000 (10:09 +0000)]
Merge "Rename KeychainProtectionParameter to KeychainProtectionParams"
David Chaloupka [Thu, 18 Jan 2018 10:06:01 +0000 (10:06 +0000)]
Merge "Adjust file reference type in 'aapt2 convert'"
Jan Althaus [Thu, 18 Jan 2018 09:50:32 +0000 (10:50 +0100)]
Fixing incorrect doc string
Test: N/A
Change-Id: I718c44902c44097b5883fd1f204ef66279b5cca4
TreeHugger Robot [Thu, 18 Jan 2018 09:26:37 +0000 (09:26 +0000)]
Merge "Promote DISALLOW_RUN_IN_BACKGROUND to SystemAPI"
Neil Fuller [Thu, 18 Jan 2018 09:18:27 +0000 (09:18 +0000)]
Merge "Javadoc fixes to Time"
Robert Berry [Wed, 17 Jan 2018 14:16:39 +0000 (14:16 +0000)]
Use RecoverySession object to hide session IDs
Session IDs are an implementation detail that the framework can (and should)
abstract away.
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ieba641a9b54ac9bba197a6e9749b621a07e40c67
Robert Berry [Wed, 17 Jan 2018 23:28:45 +0000 (23:28 +0000)]
Rename KeychainProtectionParameter to KeychainProtectionParams
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Iab6d85d0be38e1a09ce78bb96b8f68493de65be9
Bo Zhu [Thu, 18 Jan 2018 01:34:26 +0000 (17:34 -0800)]
Update the VaultParams encoding to reflect the recent change in the
format of vault_handle
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I105d17ac87b70795fa977b7649c7a1fdcb97b5e9
Bill Yi [Thu, 18 Jan 2018 07:23:21 +0000 (23:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: I187ddfcd5388173662e45da5ef3f19a1d17be32c
Auto-generated-cl: translation import
Bill Yi [Thu, 18 Jan 2018 07:19:59 +0000 (23:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8457b08b667801127c2bb943639a4ea2ff86de05
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 18 Jan 2018 06:37:27 +0000 (06:37 +0000)]
Merge "Clean up: remove drawer from root settings layout"
Bill Yi [Thu, 18 Jan 2018 06:25:01 +0000 (22:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6b13005d123462b08911d4fec5600311fccf9dee
Auto-generated-cl: translation import
Bill Yi [Thu, 18 Jan 2018 05:55:22 +0000 (21:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1840cf7401e12dbfc7624e4ffd155f903fb59e36
Auto-generated-cl: translation import
Yangster-mac [Wed, 17 Jan 2018 20:26:34 +0000 (12:26 -0800)]
Proto change for dimension from condition.
Test: all statsd unit tests and cts tests passed.
Change-Id: I955143aca7c76e2e22a10d7ba42eb797bd32e147
Holly Jiuyu Sun [Thu, 18 Jan 2018 04:28:28 +0000 (04:28 +0000)]
Merge "Add APIs to EuiccCardManager." am:
a5bc474e2c am:
f07319a6df
am:
beacd5e4fa
Change-Id: I7aa42d89c69911137a86b86ee59463efe46a81c3
Jeff Sharkey [Thu, 18 Jan 2018 04:20:44 +0000 (04:20 +0000)]
Merge "Add "not congested" network capability." am:
ffaddf73de am:
abb158f712
am:
1ed2bee762
Change-Id: I836fedeab34f34a43e0257e395fca1f735bc6d61
Holly Jiuyu Sun [Thu, 18 Jan 2018 04:14:54 +0000 (04:14 +0000)]
Merge "Add APIs to EuiccCardManager." am:
a5bc474e2c
am:
f07319a6df
Change-Id: I71b5ea764f306a8a852f08a99f6a7247109e3511
Erik Kline [Thu, 18 Jan 2018 04:10:12 +0000 (04:10 +0000)]
Merge "Add basic resolution of Private DNS hostname" am:
a3bf36f050 am:
4218c522a7
am:
0b250b6132
Change-Id: Iacdad88b49aff3e34afc93acfb8d3eeca9745c43
Jeff Sharkey [Thu, 18 Jan 2018 04:10:00 +0000 (04:10 +0000)]
Merge "Add "not congested" network capability." am:
ffaddf73de
am:
abb158f712
Change-Id: I2c7276bd657f5805c0b6492a216435270023a3c6
Erik Kline [Thu, 18 Jan 2018 04:02:46 +0000 (04:02 +0000)]
Merge "Add basic resolution of Private DNS hostname" am:
a3bf36f050
am:
4218c522a7
Change-Id: Ifc776c67025925fbeb2c13038ae78061c32567f5
Holly Jiuyu Sun [Thu, 18 Jan 2018 04:01:59 +0000 (04:01 +0000)]
Merge "Add APIs to EuiccCardManager."
am:
a5bc474e2c
Change-Id: Ib0653ef73bb59f5dba2396bde20d1f29b107da86
Jeff Sharkey [Thu, 18 Jan 2018 03:58:13 +0000 (03:58 +0000)]
Merge "Add "not congested" network capability."
am:
ffaddf73de
Change-Id: I02ea25610df63b40547c3114c0f9a9ef59560e90
Erik Kline [Thu, 18 Jan 2018 03:54:50 +0000 (03:54 +0000)]
Merge "Add basic resolution of Private DNS hostname"
am:
a3bf36f050
Change-Id: I9ce3476d80b05c140a02aaf1c21d4da2a68a8909
Lorenzo Colitti [Thu, 18 Jan 2018 03:36:37 +0000 (03:36 +0000)]
Merge "Add public API methods for private DNS." am:
aacb56a7c0 am:
f193c6d37d
am:
7b212d3562
Change-Id: Icd04bc83624ea4d13ac7737e6f9a7b0c5f0f7314
Holly Jiuyu Sun [Thu, 18 Jan 2018 03:32:22 +0000 (03:32 +0000)]
Merge "Add APIs to EuiccCardManager."
Jeff Sharkey [Thu, 18 Jan 2018 03:28:34 +0000 (03:28 +0000)]
Merge "Add "not congested" network capability."
Lorenzo Colitti [Thu, 18 Jan 2018 03:27:51 +0000 (03:27 +0000)]
Merge "Add public API methods for private DNS." am:
aacb56a7c0
am:
f193c6d37d
Change-Id: I8d5a5b72c128231cca1dfb00bc00e887b5fbfc53
Lorenzo Colitti [Thu, 18 Jan 2018 03:21:02 +0000 (03:21 +0000)]
Merge "Add public API methods for private DNS."
am:
aacb56a7c0
Change-Id: If2bdfb05fcb235888bf272e4cfddb14619fc3f78
TreeHugger Robot [Thu, 18 Jan 2018 02:50:48 +0000 (02:50 +0000)]
Merge "Add recent disk write speed metrics to Disk Stats"
Treehugger Robot [Thu, 18 Jan 2018 02:44:53 +0000 (02:44 +0000)]
Merge "Add basic resolution of Private DNS hostname"
TreeHugger Robot [Thu, 18 Jan 2018 02:29:23 +0000 (02:29 +0000)]
Merge "Add video priority to Process.java"
Pavlin Radoslavov [Thu, 18 Jan 2018 02:25:31 +0000 (02:25 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()" am:
877cbe1dc2 am:
18606e1601
am:
9114a49770
Change-Id: I55d0175bb715dbd28176032ace129a2c85a218f0
Pavlin Radoslavov [Thu, 18 Jan 2018 02:18:03 +0000 (02:18 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()" am:
877cbe1dc2
am:
18606e1601
Change-Id: I58199a6c70bfa03fc515c573b936c78ec34d61ac
Pavlin Radoslavov [Thu, 18 Jan 2018 02:10:31 +0000 (02:10 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()"
am:
877cbe1dc2
Change-Id: Ifb7b28f3993e3d8967886bdff006bcd2679d3277
TreeHugger Robot [Thu, 18 Jan 2018 01:48:27 +0000 (01:48 +0000)]
Merge "Add performance test for Debug.getPss()"
Victor Hsieh [Thu, 18 Jan 2018 01:31:09 +0000 (01:31 +0000)]
Merge "Reland: Move zygote's seccomp setup to post-fork" am:
7839672e22 am:
4249466562
am:
dec688691d
Change-Id: Ibcf5eeef74b69112f568ebb1f146c2990ffed30a
TreeHugger Robot [Thu, 18 Jan 2018 01:25:58 +0000 (01:25 +0000)]
Merge "Create exception hierarchy for RecoveryController"
TreeHugger Robot [Thu, 18 Jan 2018 01:25:22 +0000 (01:25 +0000)]
Merge "Implements toString in NanoAppMessage/ContextHubMessage"
Victor Hsieh [Thu, 18 Jan 2018 01:23:32 +0000 (01:23 +0000)]
Merge "Reland: Move zygote's seccomp setup to post-fork" am:
7839672e22
am:
4249466562
Change-Id: Idbf4d7add5e41d2d01f4a3c2ff6e8f1b1735faeb
TreeHugger Robot [Thu, 18 Jan 2018 01:21:25 +0000 (01:21 +0000)]
Merge "Fixes null error for quick scrub when there is no home button"
Joseph Pirozzo [Thu, 18 Jan 2018 01:19:19 +0000 (01:19 +0000)]
Merge "Bluetooth in band ring" am:
dbfaf31357 am:
8c73ee91f5
am:
2746e9ab16
Change-Id: I2d43475d33c764b2b0951f7e4ddc969e8fce7c49
OSDN Git Service
