Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
354,486 Commits 3 Branches 0 Tags
4fa2aa03ea0dac86367bec08ed09df0345c4647a
Commit Graph

86208 Commits

Author SHA1 Message Date
Petr Cermak
4fa2aa03ea Merge "Add "results source" parameter to RemoteInput" 2018-01-18 17:39:34 +00:00
TreeHugger Robot
4212de2e74 Merge "Add adb command to get max running users" 2018-01-18 16:50:31 +00:00
Bryce Lee
e6c2b50229 Merge "Disallow starting activities without new task from non-activity context." 2018-01-18 15:49:15 +00:00
Kenny Guy
0e4bc3f2ba Merge "Add more brightness config details to dumpsys" 2018-01-18 15:18:08 +00:00
Alex Chau
c12189b24c Add adb command to get max running users 
Bug: 72033601
Test: New command is working
Change-Id: I38746a2c03a6da35e7d8a149e1fb0b3604234dbc
 2018-01-18 15:17:22 +00:00
TreeHugger Robot
e8ffec1661 Merge "Add hint to indicate 'see more' type content" 2018-01-18 14:17:14 +00:00
Robert Berry
588a06f5a2 Merge "Revert "Use RecoverySession object to hide session IDs"" 2018-01-18 12:24:06 +00:00
Robert Berry
9fa87627ed Revert "Use RecoverySession object to hide session IDs" 
This reverts commit 988c55ce67.

Reason for revert: broke some tests

Change-Id: Ib43099aebc8ff025e052337475bab13445da74eb
 2018-01-18 12:23:33 +00:00
TreeHugger Robot
20f29fdaca Merge "Fix extra space in Suggestions Popup" 2018-01-18 12:20:37 +00:00
TreeHugger Robot
a2ade1b151 Merge "Fixing incorrect doc string" 2018-01-18 11:55:35 +00:00
TreeHugger Robot
9c1d6baba7 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
 2018-01-18 11:11:40 +00:00
Android Build Merger (Role)
c9e76ed0a1 Merge "Merge "Javadoc fixes to Time" am: b3c2efc615 am: b51c638a6c am: 90a56a59d5" 2018-01-18 10:41:00 +00:00
Neil Fuller
dd704e316b Merge "Javadoc fixes to Time" am: b3c2efc615 am: b51c638a6c 
am: 90a56a59d5

Change-Id: I62545bdd0604ee0911249abd7628c99868093c77
 2018-01-18 10:40:42 +00:00
TreeHugger Robot
c4e99794e9 Merge "Use RecoverySession object to hide session IDs" 2018-01-18 10:40:24 +00:00
Neil Fuller
90a56a59d5 Merge "Javadoc fixes to Time" am: b3c2efc615 
am: b51c638a6c

Change-Id: Ifea3eb9d25754155681b1f74096eacac1fa0b259
 2018-01-18 10:31:35 +00:00
TreeHugger Robot
15b0089c01 Merge "KeyStore: Remove duplicate method" 2018-01-18 10:26:44 +00:00
Neil Fuller
b51c638a6c Merge "Javadoc fixes to Time" 
am: b3c2efc615

Change-Id: I9793670f518d15fc42caa01a519c33e451998a77
 2018-01-18 10:26:13 +00:00
TreeHugger Robot
437513c083 Merge "Rename KeychainProtectionParameter to KeychainProtectionParams" 2018-01-18 10:09:09 +00:00
Jan Althaus
1331068084 Fixing incorrect doc string 
Test: N/A
Change-Id: I718c44902c44097b5883fd1f204ef66279b5cca4
 2018-01-18 10:50:32 +01:00
TreeHugger Robot
0b2941fb09 Merge "Promote DISALLOW_RUN_IN_BACKGROUND to SystemAPI" 2018-01-18 09:26:37 +00:00
Neil Fuller
b3c2efc615 Merge "Javadoc fixes to Time" 2018-01-18 09:18:27 +00:00
Robert Berry
988c55ce67 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
 2018-01-18 08:25:26 +00:00
Robert Berry
9e1bd362df 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
 2018-01-18 08:21:43 +00:00
Jeff Sharkey
8ec0201e8f Merge "Add "not congested" network capability." am: ffaddf73de am: abb158f712 
am: 1ed2bee762

Change-Id: I836fedeab34f34a43e0257e395fca1f735bc6d61
 2018-01-18 04:20:44 +00:00
Jeff Sharkey
1ed2bee762 Merge "Add "not congested" network capability." am: ffaddf73de 
am: abb158f712

Change-Id: I2c7276bd657f5805c0b6492a216435270023a3c6
 2018-01-18 04:10:00 +00:00
Jeff Sharkey
abb158f712 Merge "Add "not congested" network capability." 
am: ffaddf73de

Change-Id: I02ea25610df63b40547c3114c0f9a9ef59560e90
 2018-01-18 03:58:13 +00:00
Lorenzo Colitti
36ec567b4a Merge "Add public API methods for private DNS." am: aacb56a7c0 am: f193c6d37d 
am: 7b212d3562

Change-Id: Icd04bc83624ea4d13ac7737e6f9a7b0c5f0f7314
 2018-01-18 03:36:37 +00:00
Jeff Sharkey
ffaddf73de Merge "Add "not congested" network capability." 2018-01-18 03:28:34 +00:00
Lorenzo Colitti
7b212d3562 Merge "Add public API methods for private DNS." am: aacb56a7c0 
am: f193c6d37d

Change-Id: I8d5a5b72c128231cca1dfb00bc00e887b5fbfc53
 2018-01-18 03:27:51 +00:00
Lorenzo Colitti
f193c6d37d Merge "Add public API methods for private DNS." 
am: aacb56a7c0

Change-Id: If2bdfb05fcb235888bf272e4cfddb14619fc3f78
 2018-01-18 03:21:02 +00:00
TreeHugger Robot
c2393e12b7 Merge "Add video priority to Process.java" 2018-01-18 02:29:23 +00:00
Pavlin Radoslavov
fd77635da1 Merge "Added internal API getMaxConnectedAudioDevices()" am: 877cbe1dc2 am: 18606e1601 
am: 9114a49770

Change-Id: I55d0175bb715dbd28176032ace129a2c85a218f0
 2018-01-18 02:25:31 +00:00
Pavlin Radoslavov
9114a49770 Merge "Added internal API getMaxConnectedAudioDevices()" am: 877cbe1dc2 
am: 18606e1601

Change-Id: I58199a6c70bfa03fc515c573b936c78ec34d61ac
 2018-01-18 02:18:03 +00:00
Pavlin Radoslavov
18606e1601 Merge "Added internal API getMaxConnectedAudioDevices()" 
am: 877cbe1dc2

Change-Id: Ifb7b28f3993e3d8967886bdff006bcd2679d3277
 2018-01-18 02:10:31 +00:00
Victor Hsieh
217682248b Merge "Reland: Move zygote's seccomp setup to post-fork" am: 7839672e22 am: 4249466562 
am: dec688691d

Change-Id: Ibcf5eeef74b69112f568ebb1f146c2990ffed30a
 2018-01-18 01:31:09 +00:00
TreeHugger Robot
4dc78301e7 Merge "Create exception hierarchy for RecoveryController" 2018-01-18 01:25:58 +00:00
TreeHugger Robot
7289feef11 Merge "Implements toString in NanoAppMessage/ContextHubMessage" 2018-01-18 01:25:22 +00:00
Victor Hsieh
dec688691d Merge "Reland: Move zygote's seccomp setup to post-fork" am: 7839672e22 
am: 4249466562

Change-Id: Idbf4d7add5e41d2d01f4a3c2ff6e8f1b1735faeb
 2018-01-18 01:23:32 +00:00
Joseph Pirozzo
a246885905 Merge "Bluetooth in band ring" am: dbfaf31357 am: 8c73ee91f5 
am: 2746e9ab16

Change-Id: I2d43475d33c764b2b0951f7e4ddc969e8fce7c49
 2018-01-18 01:19:19 +00:00
Lorenzo Colitti
aacb56a7c0 Merge "Add public API methods for private DNS." 2018-01-18 01:17:17 +00:00
Victor Hsieh
4249466562 Merge "Reland: Move zygote's seccomp setup to post-fork" 
am: 7839672e22

Change-Id: I93275a50938ed1514fc690fe2e1390054748d361
 2018-01-18 01:15:05 +00:00
Abodunrinwa Toki
f317e583e4 Merge "Implement text baseline attributes for TextView." 2018-01-18 01:11:05 +00:00
Joseph Pirozzo
2746e9ab16 Merge "Bluetooth in band ring" am: dbfaf31357 
am: 8c73ee91f5

Change-Id: I1972da1da7bc0c001dc4525858bdb0e8bd5dd530
 2018-01-18 01:09:30 +00:00
Joseph Pirozzo
8c73ee91f5 Merge "Bluetooth in band ring" 
am: dbfaf31357

Change-Id: I24b9169afc67e376a22c99f8a1ae7117549401f8
 2018-01-18 01:02:14 +00:00
Treehugger Robot
877cbe1dc2 Merge "Added internal API getMaxConnectedAudioDevices()" 2018-01-18 00:46:57 +00:00
Selim Cinek
1397ea3b91 Improved the experience when sending multiple messages 
MessagingStyle wasn't properly picking up the remote input history,
but it was just ignored.
In addition was the display of 1to1 conversations wrong in that case.

Bug: 63708826
Test: manual add notification with MessagingStyle, reply.
Change-Id: I32141ecfb7dce948930de2477157f0fcddf7ba52
 2018-01-17 16:22:28 -08:00
Jorim Jaggi
1f2acb9a16 Merge "Add ability to register remote animation definitions per activity" 2018-01-18 00:17:26 +00:00
Dake Gu
d4356fdf4b Merge "autofill: support dpad/keyboard" 2018-01-18 00:14:36 +00:00
Treehugger Robot
7839672e22 Merge "Reland: Move zygote's seccomp setup to post-fork" 2018-01-17 23:58:10 +00:00
TreeHugger Robot
1721004ec9 Merge "Customize user switch dialog" 2018-01-17 23:55:47 +00:00