Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
363,196 Commits 3 Branches 0 Tags
74d615f1acec2db8fd27f331d62cc89701b25741
Commit Graph

88811 Commits

Author SHA1 Message Date
Michael Kwan
74d615f1ac Merge "Modify time only mode flag into set of values instead of just one." into pi-dev 
am: c5d0ed9f3c

Change-Id: I4721197b1329a14aa51f1b49a05bdade1fb71ef8
 2018-03-17 22:22:33 +00:00
Michael Kwan
c5d0ed9f3c Merge "Modify time only mode flag into set of values instead of just one." into pi-dev 2018-03-17 22:05:38 +00:00
TreeHugger Robot
685288127d Merge "Docstring Updates for applyTransportModeTransform" into pi-dev 2018-03-17 03:44:46 +00:00
nharold
a88433c216 Merge "Docstring Updates for applyTransportModeTransform" am: 00ef20e853 
am: e3a6b678c3

Change-Id: I58ab2b451ef1d0c20efe80d30a679e8870a39a8e
 2018-03-17 02:16:38 +00:00
nharold
e3a6b678c3 Merge "Docstring Updates for applyTransportModeTransform" 
am: 00ef20e853

Change-Id: I2b59ebf0b751f7f404d175ad394a4dfdbf7169ff
 2018-03-17 02:00:57 +00:00
Julia Reynolds
1e856ca8c3 Merge "Add new semantic Person fields" into pi-dev 
am: 6389e7bc44

Change-Id: I316ff063efbe3c36a34e3e9e00a463ae4364c4bd
 2018-03-17 01:50:45 +00:00
Julia Reynolds
6389e7bc44 Merge "Add new semantic Person fields" into pi-dev 2018-03-17 01:35:20 +00:00
Nathan Harold
7b7bea0485 Docstring Updates for applyTransportModeTransform 
-Add anotations to usages of PolicyDirection for
 apply...() methods.
-Update the comments on DIRECTION_IN and DIRECTION_OUT
 to better reflect their current usage.
-Add a better explanation to the rekey procedure doc.
-Remove disused createTunnelInterface() stub.

Bug: 73751066
Test: make docs
Merged-In: I9f2ec864466148a18899f1e952c74a525902ccbc
Change-Id: I9f2ec864466148a18899f1e952c74a525902ccbc
(cherry picked from commit f4cdf25a90)
 2018-03-16 17:46:05 -07:00
Chad Brubaker
aee0b80abf Merge "Hide notifications when in Lockdown mode" into pi-dev 
am: 36b0b60e40

Change-Id: I693e95915f60638ae769433e778c2b11bb11e82e
 2018-03-17 00:39:12 +00:00
nharold
00ef20e853 Merge "Docstring Updates for applyTransportModeTransform" 2018-03-17 00:33:10 +00:00
Nathan Harold
f4cdf25a90 Docstring Updates for applyTransportModeTransform 
-Add anotations to usages of PolicyDirection for
 apply...() methods.
-Update the comments on DIRECTION_IN and DIRECTION_OUT
 to better reflect their current usage.
-Add a better explanation to the rekey procedure doc.
-Remove disused createTunnelInterface() stub.

Bug: 73751066
Test: make docs
Change-Id: I9f2ec864466148a18899f1e952c74a525902ccbc
 2018-03-16 17:29:45 -07:00
Chad Brubaker
36b0b60e40 Merge "Hide notifications when in Lockdown mode" into pi-dev 2018-03-17 00:16:34 +00:00
Amith Yamasani
0071ccea48 Merge "App Time Limits API in UsageStats" into pi-dev 
am: a8bb9d255f

Change-Id: I77b6656d38701b76444c64be1d75c7b86e70e3bb
 2018-03-16 23:08:42 +00:00
Aseem Kumar
12c26fc509 Merge "Unhide getKey() and importKey() and the whole class of RecoveryController. Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all public APIs of RecoveryController." into pi-dev 
am: 3b0450d4a9

Change-Id: I650b80562b8e19d5264ec897f30145b5b393e77b
 2018-03-16 22:51:56 +00:00
TreeHugger Robot
a8bb9d255f Merge "App Time Limits API in UsageStats" into pi-dev 2018-03-16 22:40:46 +00:00
Aseem Kumar
3b0450d4a9 Merge "Unhide getKey() and importKey() and the whole class of RecoveryController. Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all public APIs of RecoveryController." into pi-dev 2018-03-16 22:27:37 +00:00
Ruchi Kandoi
a3180099bf Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" am: 01cef932c8 
am: 7ad52283ab

Change-Id: I4cdeed1b3b55de95e58c8784e379ccfe9da7e4d8
 2018-03-16 21:43:04 +00:00
Ruchi Kandoi
7ad52283ab Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" 
am: 01cef932c8

Change-Id: Ic8c8b5566a4278af7ecf745d4b3c8d18a1d848b7
 2018-03-16 21:28:18 +00:00
Treehugger Robot
01cef932c8 Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" 2018-03-16 20:12:04 +00:00
Aseem Kumar
c1742e5137 Unhide getKey() and importKey() and the whole class of RecoveryController. 
Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all
public APIs of RecoveryController.

Bug: 73900159
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I1047c038603869307d7a2462a2e5635fcd1c94c2
 2018-03-16 13:07:25 -07:00
Anthony Stange
5dd917de9f Merge "Add scan background mode to Settings.Global." am: 3aa064897e 
am: 4061a9f348

Change-Id: Iac4d39cc4fcf0f0c8273cee7fbe9822251764068
 2018-03-16 19:40:08 +00:00
Michael Kwan
5f5a0bf00d Modify time only mode flag into set of values instead of just one. 
The time only mode flag has not been used yet, so the change should
be low impact.

Bug: 38259902
Test: m -j32
Change-Id: Ie01870633dbaaf51989a148f105a995f58f0da4e
 2018-03-16 12:34:19 -07:00
Anthony Stange
4061a9f348 Merge "Add scan background mode to Settings.Global." 
am: 3aa064897e

Change-Id: I2993a751fbf17b561f770307f199ab1c1d4469b8
 2018-03-16 19:29:03 +00:00
Julia Reynolds
18c35dfd61 Add new semantic Person fields 
Bug: 74431200
Test: cts
Change-Id: I9eda447ae371ef635e9044a13ba7973bd69520ce
 2018-03-16 19:13:51 +00:00
Yi Jin
69219b1728 Merge "Fix privacy tags based on PWG review meeting." into pi-dev 
am: 7d17dd7184

Change-Id: Iedbd95f7a0c4cc0a42e5ebc38e79d684657c708d
 2018-03-16 18:49:15 +00:00
Yi Jin
7d17dd7184 Merge "Fix privacy tags based on PWG review meeting." into pi-dev 2018-03-16 18:18:11 +00:00
Dake Gu
478726760f Merge "autofill: ViewRootImpl.dispatchKeyFromIme() should not be dropped" into pi-dev 
am: 21935e0c6f

Change-Id: Ifceea4563157f208627e289e3c3eb800aac7d522
 2018-03-16 17:49:52 +00:00
Dake Gu
21935e0c6f Merge "autofill: ViewRootImpl.dispatchKeyFromIme() should not be dropped" into pi-dev 2018-03-16 17:32:25 +00:00
Philip P. Moltmann
3a129ef0d5 Merge "onUnsyncableAccount: Better docs, main thread" into pi-dev 
am: ddbb9d00a2

Change-Id: Ic1e4f9a8d7b978c58c42b818c3022f3749a4785e
 2018-03-16 16:31:19 +00:00
Seigo Nonaka
b8293dee84 Merge "Make PrecomputedText Spannable for supporting selection" into pi-dev 
am: 71ed54f377

Change-Id: I9f755b9ba3b5b4b909f57708bb7bdcec349e0724
 2018-03-16 16:10:55 +00:00
Anthony Stange
ff54a35a0f Add scan background mode to Settings.Global. 
This enables us to mess with the different scan intervals and shift
clients to a different scan mode in the background based on what scan
interval values we choose for the different power modes.

Bug: 71765044
Test: None. Just adding a key.
Change-Id: Id48ebc521dd3fe8a68c9c4c0bdb1018ea5b3743e
 2018-03-16 16:07:45 +00:00
Philip P. Moltmann
ddbb9d00a2 Merge "onUnsyncableAccount: Better docs, main thread" into pi-dev 2018-03-16 16:04:08 +00:00
TreeHugger Robot
71ed54f377 Merge "Make PrecomputedText Spannable for supporting selection" into pi-dev 2018-03-16 15:43:46 +00:00
Alan Viverette
5ea38d0493 Merge "Restore "Update packages for 1.0.0-beta1"" into pi-dev 
am: 259dd151f4

Change-Id: Ic2ac3ecafbfa6ff29580c86f7a639783b94f21dc
 2018-03-16 14:06:04 +00:00
Alan Viverette
259dd151f4 Merge "Restore "Update packages for 1.0.0-beta1"" into pi-dev 2018-03-16 13:53:46 +00:00
Adrian Roos
2b3389feaf Merge "DisplayCutout: Add corner cutout overlay" into pi-dev 
am: e90248c00e

Change-Id: I9aac0a0298107e727a0a0f044692d15632e691d4
 2018-03-16 13:12:20 +00:00
Adrian Roos
e90248c00e Merge "DisplayCutout: Add corner cutout overlay" into pi-dev 2018-03-16 13:01:00 +00:00
Annie Meng
dc671e166d Merge "DO NOT MERGE Create a setting for backup/restore agent timeouts" into pi-dev 
am: ec243338ea

Change-Id: I229ad0b8545f7aa2d4cfabf72cf39b90ec6e000d
 2018-03-16 10:37:19 +00:00
Annie Meng
ec243338ea Merge "DO NOT MERGE Create a setting for backup/restore agent timeouts" into pi-dev 2018-03-16 10:25:32 +00:00
Ryo Hashimoto
583d8962a4 Merge "Change FUSE_MAX_WRITE's value to 128KB" into pi-dev 
am: ebc30594e0

Change-Id: I2b7f32f7e500a8c4cacfeb84966d149b41e32ac8
 2018-03-16 04:42:55 +00:00
TreeHugger Robot
a2d0f2f335 Merge "Frameworks: Fix system server profiling" into pi-dev 2018-03-16 04:00:48 +00:00
TreeHugger Robot
ebc30594e0 Merge "Change FUSE_MAX_WRITE's value to 128KB" into pi-dev 2018-03-16 03:00:44 +00:00
Jason Monk
6bea8a4bb9 Merge "SliceManager: Relax explicit checks on map a little bit" into pi-dev 
am: 0b795eb88e

Change-Id: I7b480717453d7ace26033066279a3c20e68cb7aa
 2018-03-16 02:07:06 +00:00
Yi Jin
163967fe8e Fix privacy tags based on PWG review meeting. 
1. Remove unnecessary hex_hashs.
2. Make intent extras LOCAL
3. Make mnc EXPLICIT
4. Make diskstats error AUTO since it is only IOException.

It is safe to modify proto numbers since they are not used yet.

Bug: 74837756
Test: flash the changes and call incident -d, also updated go/irpf
Change-Id: Idee0e927515e737c9a42a1dc29cb3c05e6d91ca9
 2018-03-15 18:31:36 -07:00
Miao-chen Chou
158344f78a Merge "Bluetooth: preserve one advertisement slot for GMS core" am: 00cc1847d3 
am: 922ae0237f

Change-Id: Ifd790251d6531d3556af7b470e681f06f3e25070
 2018-03-16 01:30:30 +00:00
Miao-chen Chou
922ae0237f Merge "Bluetooth: preserve one advertisement slot for GMS core" 
am: 00cc1847d3

Change-Id: I5a6d39107b49690e11afd8c7e394554fbf616e11
 2018-03-16 01:13:07 +00:00
Chenjie Yu
e3621e06c6 Merge "Fix uid for AppBreadcrumbReported for 3p app" into pi-dev 
am: a3178fc440

Change-Id: I681358bd056e92c0ecc18e8137bedd87e433b640
 2018-03-16 00:22:01 +00:00
Chien-Yu Chen
a95a760759 Merge "camera2: Add links for aeState" into pi-dev 
am: 43a4dffd77

Change-Id: I0e60c01b6c4a03d4d23fa32265696059c1528f07
 2018-03-16 00:17:19 +00:00
TreeHugger Robot
0b795eb88e Merge "SliceManager: Relax explicit checks on map a little bit" into pi-dev 2018-03-16 00:11:53 +00:00
Amith Yamasani
62ec27e97f App Time Limits API in UsageStats 
Allow setting groups of apps to control usage time limits on.
Applies only to activity time in the foreground.

Updated UsageStatsTest app to be able to add an observer for
a 30 second timeout across multiple comma separated package
names.

Bug: 74335821
Test: atest FrameworksServicesTests:AppTimeLimitControllerTests
      Install and run frameworks/base/tests/UsageStatsTest

Change-Id: I677c30b4f211f7acf72c9766df3d8c1ac56a4b4e
 2018-03-15 17:07:28 -07:00