drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
296,738 Commits 1 Branch 0 Tags
Commit Graph

296738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ashutosh Joshi
28b3dcea85 Merge "Deprecate the activity recognition HAL." 2016-11-22 22:53:42 +00:00
TreeHugger Robot
44efac310a Merge "Implement tooltip support in View" 2016-11-22 22:15:46 +00:00
Ian Pedowitz
a53e2bc3c0 Merge "Revert "Move Resource creation out of ContextImpl constructor"" 2016-11-22 21:30:01 +00:00
TreeHugger Robot
0cde53ea13 Merge "Use push/peek/pop for operations on stack" 2016-11-22 20:53:30 +00:00
Etan Cohen
f256805d10 Merge "[CS] Remove timeout event after first available" 2016-11-22 20:21:44 +00:00
Adam Lesinski
304321ed8d Revert "Move Resource creation out of ContextImpl constructor" 
This reverts commit 16efc5e68d77903b84943bd9917bfd858332c183.

Caused issue with device protected settings: http://b/33066012

Change-Id: Ib485bed68ea8ac199d553b666c18d048a5624c98
 2016-11-22 19:41:55 +00:00
Fyodor Kupolov
5237f47b82 Use push/peek/pop for operations on stack 
Test: manual - device boots, metrics are logged to system/event log
Bug: 32780225
Change-Id: If7e51c50767d8fd9d5da44f61dbc5bfe56196894
 2016-11-22 11:02:07 -08:00
Zach Jang
6ce1e98c9f Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev am: d427da8a24 am: 466bb400bb am: 52a3542096 
am: 4c428778c3

Change-Id: Ieac6a7b7a0676114d463b9f4fe24b230b416524f
 2016-11-22 18:21:04 +00:00
Zach Jang
794e9022c9 Revert "Catch KeyStoreException for setting profile lock" am: e61672ab08 am: fe3b0b2cc1 am: f516131a38 
am: af98d20dc6

Change-Id: Ib443a1fea735b8aa240d724fc7a24c91102440ef
 2016-11-22 18:16:14 +00:00
Zach Jang
4c428778c3 Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev am: d427da8a24 am: 466bb400bb 
am: 52a3542096

Change-Id: Ifa7aead1d53406409e5301724f44f8d7309e8911
 2016-11-22 18:14:21 +00:00
Zach Jang
af98d20dc6 Revert "Catch KeyStoreException for setting profile lock" am: e61672ab08 am: fe3b0b2cc1 
am: f516131a38

Change-Id: Ica7d8825fb973e288270e21345066a675818836e
 2016-11-22 18:08:35 +00:00
Zach Jang
52a3542096 Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev am: d427da8a24 
am: 466bb400bb

Change-Id: I49c4ed53cb2341d34855d53f5e66a95a7c0130af
 2016-11-22 18:04:13 +00:00
Zach Jang
f516131a38 Revert "Catch KeyStoreException for setting profile lock" am: e61672ab08 
am: fe3b0b2cc1

Change-Id: Iba7288ba01872f804a22814f4615b202010d7194
 2016-11-22 18:03:27 +00:00
Zach Jang
466bb400bb Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev 
am: d427da8a24

Change-Id: I8a4f01466e4b93782478e94240f2c8f2d74972ad
 2016-11-22 17:59:02 +00:00
Zach Jang
fe3b0b2cc1 Revert "Catch KeyStoreException for setting profile lock" 
am: e61672ab08

Change-Id: Ie1a720181bf542bbf213af8b6b83eff0ecd84a98
 2016-11-22 17:58:58 +00:00
Martijn Coenen
94c1ead8bb Merge "Add SystemProperties.reportSyspropChanged()." am: 45c0c6939f am: 8c05ff96fb am: 201cf4fb27 
am: d42b1d01ca

Change-Id: I05410af5c0e9fe0807d6198aa5c6bdc2eb745ff8
 2016-11-22 17:55:47 +00:00
Peter Qiu
028f18d340 Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration" am: 248c8311e8 am: 3aa7fdd19a am: 5366e9bf71 
am: f598da48f2

Change-Id: I005042e2acf5f53fd70373443f7763b68d783f0f
 2016-11-22 17:52:57 +00:00
Zach Jang
d427da8a24 Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev 2016-11-22 17:51:59 +00:00
Ta-wei Yen
e40beac314 Merge "Make voicemail notification broadcast public" am: 6a56326109 am: 9b614baeab am: f05c651c99 
am: dcb9f3c8ed

Change-Id: I0d5e582d5e145c59ee1f24258c74549ec0acf7aa
 2016-11-22 17:50:53 +00:00
Zach Jang
e61672ab08 Revert "Catch KeyStoreException for setting profile lock" 
This reverts commit c8fa5ed8f2d492aa5e005fcdb5991c3f980de045.

Change-Id: Ia1425e649e102cb79280d75e5f49db670214cec3
 2016-11-22 17:47:18 +00:00
Fyodor Kupolov
9b2cdd9be0 Merge "Additional boot metrics" 2016-11-22 17:45:01 +00:00
Vladislav Kaznacheev
f847ee3c3d Implement tooltip support in View 
Adding View.setTooltip/getTooltip and 'tooltip' layout attribute.
Following Material Design spec for styles and behavior.

Bug: 31515376
Test:  cts-tradefed run singleCommand cts -m CtsViewTestCases
  --test android.view.cts.TooltipTest

Change-Id: I2d2527f642cd7446ffc88d4beffc7b81d7a2f6d6
 2016-11-22 09:32:07 -08:00
Jean-Michel Trivi
6d5723fe4e Merge "Define stream type for accessibility volume control" 2016-11-22 16:28:48 +00:00
TreeHugger Robot
fdd3cb5081 Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings." 2016-11-22 14:59:36 +00:00
Wale Ogunwale
23c25e7a3c Merge "WindowList be gone!" 2016-11-22 14:56:49 +00:00
Neil Fuller
3dfca02da4 Merge "Change EXTRA_TIME_PREF_24_HOUR_FORMAT from boolean to int" 2016-11-22 11:55:27 +00:00
Martijn Coenen
d42b1d01ca Merge "Add SystemProperties.reportSyspropChanged()." am: 45c0c6939f am: 8c05ff96fb 
am: 201cf4fb27

Change-Id: Ibd379f588dacbf571948d34d76abb0e6f12f3a79
 2016-11-22 10:00:36 +00:00
Martijn Coenen
201cf4fb27 Merge "Add SystemProperties.reportSyspropChanged()." am: 45c0c6939f 
am: 8c05ff96fb

Change-Id: Ib406f48dc35ecededd89ed8ed8750622a26d9ee2
 2016-11-22 09:55:03 +00:00
Martijn Coenen
8c05ff96fb Merge "Add SystemProperties.reportSyspropChanged()." 
am: 45c0c6939f

Change-Id: I83890872ba76161cf2f9a35b23861ab21b452a0f
 2016-11-22 09:49:15 +00:00
Treehugger Robot
45c0c6939f Merge "Add SystemProperties.reportSyspropChanged()." 2016-11-22 09:43:23 +00:00
Peter Qiu
f598da48f2 Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration" am: 248c8311e8 am: 3aa7fdd19a 
am: 5366e9bf71

Change-Id: I9fc34e4df6ede509d954a0973f438e18f25693f0
 2016-11-22 01:48:56 +00:00
Ta-wei Yen
dcb9f3c8ed Merge "Make voicemail notification broadcast public" am: 6a56326109 am: 9b614baeab 
am: f05c651c99

Change-Id: I8b8edb79ff63eeae8ace939ad278157032b8ded7
 2016-11-22 01:45:21 +00:00
Peter Qiu
5366e9bf71 Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration" am: 248c8311e8 
am: 3aa7fdd19a

Change-Id: Icab9addb14ba68e6878f208b14cde9f54ea3cb85
 2016-11-22 01:43:48 +00:00
Ta-wei Yen
f05c651c99 Merge "Make voicemail notification broadcast public" am: 6a56326109 
am: 9b614baeab

Change-Id: Icb636f5155c3b25a3db2978fad830fb94b959a2f
 2016-11-22 01:38:56 +00:00
Peter Qiu
3aa7fdd19a Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration" 
am: 248c8311e8

Change-Id: I9a652a0f02f2895bde3ac9e4c332c80fc38b0df6
 2016-11-22 01:37:00 +00:00
Ta-wei Yen
9b614baeab Merge "Make voicemail notification broadcast public" 
am: 6a56326109

Change-Id: Ic094db50e40a0cd46251e27f84b2a98b9040a192
 2016-11-22 01:32:00 +00:00
Fyodor Kupolov
3235e0c2ee Additional boot metrics 
Extracted duration measurement functionality into BootTimingTraceLog.
It is now shared between system_server and zygote.

Log the following metrics to tron:
- boot_zygote_init - Time in milliseconds to boot into Zygote init stage.
- boot_android_init - Time in milliseconds to boot into Android init stage.

Test: manual - device boots, metrics are logged to system/event log
Bug: 32780225
Bug: 31115337
Change-Id: I600ac7fc83d35fa226ac92c37cc4b19192b25f59
 2016-11-21 17:17:34 -08:00
Treehugger Robot
248c8311e8 Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration" 2016-11-22 00:03:43 +00:00
Fyodor Kupolov
d4f9d37424 Merge "Presubmit test for PackageManager" 2016-11-21 23:58:01 +00:00
Ashutosh Joshi
3fc75d4bf6 Merge "Cleanup ContexthubService implementation" 2016-11-21 23:39:54 +00:00
Jean-Michel Trivi
3f0945a608 Define stream type for accessibility volume control 
New stream type for accessibility volume.
Add related appOps.

Test: see added CTS tests in AudioManagerTest & Stub
Bug 30448020

Change-Id: I34f96713b22fedf75322b8ffe2b96a7c566f5009
 2016-11-21 15:15:45 -08:00
Etan Cohen
43518242a3 Merge "[AWARE] Update API per review" am: 9e4f111e0f am: ce7f932be7 am: 86cd994a15 
am: 355e52215f

Change-Id: I0f334e1db798bdfcadb4547d7edda5200e160b43
 2016-11-21 23:07:34 +00:00
Jeff Sharkey
f640cd318d Merge "StrictMode to detect untagged network traffic." am: 67fe28d925 am: db5ed5beb1 am: 3391f3376e 
am: 55727aaede

Change-Id: I272964fc9c2a9e350bacc0586dd6b2d4a23c5f51
 2016-11-21 23:05:12 +00:00
Jeff Sharkey
4df8fdb5c6 Merge "Stub Binder API." am: 4db1632b3a am: 313456c975 am: c61a8e01a3 
am: 8984897502  -s ours

Change-Id: Ib052b3afcf046786732d8084188d7fbec9805215
 2016-11-21 23:03:55 +00:00
TreeHugger Robot
e83e197931 Merge "Added 'oneway' flags on AIDL where appliable." 2016-11-21 23:00:44 +00:00
Android Build Merger (Role)
99820db99a Merge "Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev am: f9154e923b am: de098d013c am: f8ab89c514" 2016-11-21 22:56:53 +00:00
Adam Lesinski
7f79e1e476 Merge "Move Resource creation out of ContextImpl constructor" 2016-11-21 22:56:18 +00:00
Nancy Zheng
9432235fe4 Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev am: f9154e923b am: de098d013c 
am: f8ab89c514

Change-Id: I7fa6629d5264ed7c96cced3355f900b9b2b99919
 2016-11-21 22:55:55 +00:00
TreeHugger Robot
d2e6ca5266 Merge "Merge commit '2a12d8520ea6f41bd2db8577a8da82204e341c51' into manual_merge_2a12d85" 2016-11-21 22:53:04 +00:00
Treehugger Robot
6a56326109 Merge "Make voicemail notification broadcast public" 2016-11-21 22:23:13 +00:00