Commit Graph

62913 Commits

Author SHA1 Message Date
Tony Mak
7ccbbc7940 Merge "Show launcher when profile is locked immediately" into nyc-dev am: 03bdd9f
am: 9e634ad

* commit '9e634ad25d09b44eda8651272b54c68480bec6e8':
  Show launcher when profile is locked immediately
2016-03-21 14:27:15 +00:00
Tony Mak
9e634ad25d Merge "Show launcher when profile is locked immediately" into nyc-dev
am: 03bdd9f

* commit '03bdd9fa0e79aa7d4da5bc3704c74f575ab1bfa6':
  Show launcher when profile is locked immediately
2016-03-21 14:24:50 +00:00
Tony Mak
03bdd9fa0e Merge "Show launcher when profile is locked immediately" into nyc-dev 2016-03-21 14:20:45 +00:00
Tony Mak
9c6e8ced9b Show launcher when profile is locked immediately
Previously, we show launcher when keyguard is dismissed.
It introduces these issues:
1. There can be no device lock
2. user could take a quick peek of the work app

Current behavior:
1. We now show launcher once the work profile is locked.
2. Lock profile immediately if there is no device lock
3. Add cancel "lockProfileLater" logic

Bug: 27241680
Bug: 27673460
Change-Id: I765aa22d4c8ae5017c1611f5a340a4b33d463b1e
2016-03-21 13:54:32 +00:00
Victor Chang
40240b17c9 Merge "Api change of DPM.setApplicationRestrictionsManagingPackage()" into nyc-dev am: d3c0cf5
am: 6918dbc

* commit '6918dbc87144d273fae62dae7c524993f0cbba7b':
  Api change of DPM.setApplicationRestrictionsManagingPackage()
2016-03-21 13:15:12 +00:00
Victor Chang
6918dbc871 Merge "Api change of DPM.setApplicationRestrictionsManagingPackage()" into nyc-dev
am: d3c0cf5

* commit 'd3c0cf50b6c8e71c0c409abcd3b8c32f98f7cb71':
  Api change of DPM.setApplicationRestrictionsManagingPackage()
2016-03-21 13:12:47 +00:00
Victor Chang
d3c0cf50b6 Merge "Api change of DPM.setApplicationRestrictionsManagingPackage()" into nyc-dev 2016-03-21 13:08:14 +00:00
Polina Bondarenko
4c673bc676 Merge "Added skin temperature, thresholds to HardwarePropertiesManager" into nyc-dev am: c1d317f
am: 1924d23

* commit '1924d238e3d55ffd04349a3d130933f5f1d667fc':
  Added skin temperature, thresholds to HardwarePropertiesManager
2016-03-19 19:41:43 +00:00
Polina Bondarenko
1924d238e3 Merge "Added skin temperature, thresholds to HardwarePropertiesManager" into nyc-dev
am: c1d317f

* commit 'c1d317f7141801e031abae7bd3aba1183a616230':
  Added skin temperature, thresholds to HardwarePropertiesManager
2016-03-19 19:39:29 +00:00
Polina Bondarenko
eb84552ef0 Added skin temperature, thresholds to HardwarePropertiesManager
Bug: 27425887
Change-Id: I13f69ae37906b71d93edbf6bea6daf809d97cfd5
2016-03-19 10:49:18 +00:00
Ajay Panicker
001269ff89 Make BluetoothManagerCallback oneway to prevent waiting on response
Bug: 27384453
Change-Id: I2cd0f1bc03c7a1e887c89faa18d5baa6ca5be24a
2016-03-19 01:17:47 +00:00
Dianne Hackborn
2d9b2b98ef Merge "Fix issue #27653326: Sync doesn\'t work in doze maintenance" into nyc-dev am: bf949ce
am: 23430bf

* commit '23430bf34ce51fd60ba9738913cf2a600384786a':
  Fix issue #27653326: Sync doesn't work in doze maintenance
2016-03-19 01:00:06 +00:00
Dianne Hackborn
23430bf34c Merge "Fix issue #27653326: Sync doesn\'t work in doze maintenance" into nyc-dev
am: bf949ce

* commit 'bf949ce8a0f8d0a39bdc069c4bedddc4edef26e2':
  Fix issue #27653326: Sync doesn't work in doze maintenance
2016-03-19 00:57:50 +00:00
Dianne Hackborn
bf949ce8a0 Merge "Fix issue #27653326: Sync doesn't work in doze maintenance" into nyc-dev 2016-03-19 00:53:03 +00:00
Yohei Yukawa
b185f516c9 Merge "Tell IMS about missing InputConnection methods." into nyc-dev am: 1064d35
am: 5a0d9cf

* commit '5a0d9cf754ed4ac9f129a90b7e5db67dc94f4859':
  Tell IMS about missing InputConnection methods.
2016-03-19 00:46:41 +00:00
Yohei Yukawa
5a0d9cf754 Merge "Tell IMS about missing InputConnection methods." into nyc-dev
am: 1064d35

* commit '1064d35307cff0601a22c8401cb72f628883489d':
  Tell IMS about missing InputConnection methods.
2016-03-19 00:44:11 +00:00
Yohei Yukawa
1064d35307 Merge "Tell IMS about missing InputConnection methods." into nyc-dev 2016-03-19 00:36:22 +00:00
Ajay Panicker
32d5d0c34a Merge "Make BluetoothManagerCallback oneway to prevent waiting on response" am: ca430a8 am: e999bba
am: 4497835

* commit '44978350459397d996c9c3cfbd38b12ef5edcbbc':
  Make BluetoothManagerCallback oneway to prevent waiting on response
2016-03-19 00:20:55 +00:00
Ajay Panicker
4497835045 Merge "Make BluetoothManagerCallback oneway to prevent waiting on response" am: ca430a8
am: e999bba

* commit 'e999bba2a53436e0b3b98bebcd6fb4333604a69c':
  Make BluetoothManagerCallback oneway to prevent waiting on response
2016-03-19 00:18:43 +00:00
Ajay Panicker
e999bba2a5 Merge "Make BluetoothManagerCallback oneway to prevent waiting on response"
am: ca430a8

* commit 'ca430a881f29ee88ade7a541fa34799c9f47d345':
  Make BluetoothManagerCallback oneway to prevent waiting on response
2016-03-19 00:16:27 +00:00
Dianne Hackborn
2fefbcf0d1 Fix issue #27653326: Sync doesn't work in doze maintenance
Add a (configurable) delay between when we start a maintenance
window until the minimum time we will end it.

Also switch to using the alarm manager callback API.  (Yay!)

Also fix a little printing problem in the alarm manager dump
so we put the package name and not some class hash in the
summary string of an alarm entry.

Change-Id: I4281e5c80bc8b26ebc1fb6f603ec33ec0e379daa
2016-03-18 16:52:30 -07:00
Adam Powell
8277e86082 Merge "Don\'t bind ChooserTargetServices as user CURRENT" into nyc-dev am: 0cc531a
am: 2a16812

* commit '2a16812c20ed852246d145712b14395f3eecf50b':
  Don't bind ChooserTargetServices as user CURRENT
2016-03-18 23:16:14 +00:00
Ruben Brunk
cf78fb26e7 Merge "Notify VrListenerService when VR activity changes." into nyc-dev am: a46f1f7
am: de0ebae

* commit 'de0ebae35e06abc785e4f65546b0a26ea5b93f94':
  Notify VrListenerService when VR activity changes.
2016-03-18 23:16:12 +00:00
Adam Powell
2a16812c20 Merge "Don\'t bind ChooserTargetServices as user CURRENT" into nyc-dev
am: 0cc531a

* commit '0cc531ae31e1bb13ecca2cdcd8ddb296542362e0':
  Don't bind ChooserTargetServices as user CURRENT
2016-03-18 23:12:29 +00:00
Ruben Brunk
de0ebae35e Merge "Notify VrListenerService when VR activity changes." into nyc-dev
am: a46f1f7

* commit 'a46f1f7060c5212c7533cb0db3f8442f211e20eb':
  Notify VrListenerService when VR activity changes.
2016-03-18 23:12:28 +00:00
Adam Powell
0cc531ae31 Merge "Don't bind ChooserTargetServices as user CURRENT" into nyc-dev 2016-03-18 23:08:23 +00:00
Ruben Brunk
a46f1f7060 Merge "Notify VrListenerService when VR activity changes." into nyc-dev 2016-03-18 23:04:58 +00:00
Adam Powell
4c284d513c Don't bind ChooserTargetServices as user CURRENT
Bug 26151189

Change-Id: I8ea76de499f7a7b9edbf1de3117d34d91bfa36ae
2016-03-18 16:04:27 -07:00
Ruben Brunk
c7354fe2d4 Notify VrListenerService when VR activity changes.
Bug: 27536964
Bug: 22855417

Change-Id: I67e1f8e6595332b3d768a99735bbd5fd38dffdc9
2016-03-18 16:00:38 -07:00
Ajay Panicker
d455c8cd43 Make BluetoothManagerCallback oneway to prevent waiting on response
Bug: 27384453
Change-Id: I2cd0f1bc03c7a1e887c89faa18d5baa6ca5be24a
2016-03-18 22:47:26 +00:00
Chris Craik
a8617e17f4 Merge "Rebuild outline when setBackground is called." into nyc-dev am: 7fb0d09
am: 71a6ea1

* commit '71a6ea108385600c60d917258b9d43414dc14f8d':
  Rebuild outline when setBackground is called.
2016-03-18 22:37:07 +00:00
Chris Craik
71a6ea1083 Merge "Rebuild outline when setBackground is called." into nyc-dev
am: 7fb0d09

* commit '7fb0d094559b9ae431c3b520721ebdb3c111c4c2':
  Rebuild outline when setBackground is called.
2016-03-18 22:34:43 +00:00
Jakub Pawlowski
0554146ab9 Merge "Change how services are passed up to the stack" am: 2ebc12b am: d1ce469
am: 4ad0a98

* commit '4ad0a983d0b3271081da4994038964486510562f':
  Change how services are passed up to the stack
2016-03-18 22:30:47 +00:00
Chris Craik
7fb0d09455 Merge "Rebuild outline when setBackground is called." into nyc-dev 2016-03-18 22:29:20 +00:00
Jakub Pawlowski
4ad0a983d0 Merge "Change how services are passed up to the stack" am: 2ebc12b
am: d1ce469

* commit 'd1ce469a2e2a96489d2ab3bf58c4db870e00a6e2':
  Change how services are passed up to the stack
2016-03-18 22:28:36 +00:00
Chris Craik
96bacd186e Rebuild outline when setBackground is called.
bug:27505848

Also correctly register damage from profiling bars.

Change-Id: I9550c2742eb833350a077ca48eccf9b584083a1e
2016-03-18 15:28:23 -07:00
George Mount
3fbaafa4e1 Merge "Add @SafeVarargs for methods using typevar varargs." into nyc-dev am: 7f1bdd9
am: 4261a09

* commit '4261a095ad5efce7690d4d1836448d7efc0e6557':
  Add @SafeVarargs for methods using typevar varargs.
2016-03-18 22:20:29 +00:00
Jakub Pawlowski
d1ce469a2e Merge "Change how services are passed up to the stack"
am: 2ebc12b

* commit '2ebc12bb485f401e27504c235da2a935ab327937':
  Change how services are passed up to the stack
2016-03-18 22:19:41 +00:00
George Mount
4261a095ad Merge "Add @SafeVarargs for methods using typevar varargs." into nyc-dev
am: 7f1bdd9

* commit '7f1bdd9f9180574c8b6b98cefe3c542b92477295':
  Add @SafeVarargs for methods using typevar varargs.
2016-03-18 22:17:38 +00:00
George Mount
7f1bdd9f91 Merge "Add @SafeVarargs for methods using typevar varargs." into nyc-dev 2016-03-18 22:11:39 +00:00
Jeff Sharkey
4621029922 Merge "Mark more Bundles as being defusable." into nyc-dev am: 620a28b
am: c012cf2

* commit 'c012cf26869e432adf8461e7134f117d95f239e2':
  Mark more Bundles as being defusable.
2016-03-18 20:09:53 +00:00
Jeff Sharkey
c012cf2686 Merge "Mark more Bundles as being defusable." into nyc-dev
am: 620a28b

* commit '620a28bad2b1ddabddf2d78b5a20a762ebc29205':
  Mark more Bundles as being defusable.
2016-03-18 20:06:07 +00:00
Jakub Pawlowski
8d312a84d6 Change how services are passed up to the stack
Right now we pass all services, characteristics and descriptors one by one.
This patch changes that - now we pass whole GATT database at once.

Bug: 27455533
Change-Id: Ie42cd80072538e411904b9c9b011a978f26158b9
2016-03-18 12:57:33 -07:00
Jeff Sharkey
620a28bad2 Merge "Mark more Bundles as being defusable." into nyc-dev 2016-03-18 19:54:52 +00:00
Greg Kaiser
e1f0d9e73b Merge "ContextHubManager: Rename Callback class." into nyc-dev am: b8768ac
am: 6c2af2f

* commit '6c2af2f298b64987d0b54cf6f5350d2d11759d80':
  ContextHubManager: Rename Callback class.
2016-03-18 19:11:26 +00:00
Greg Kaiser
6c2af2f298 Merge "ContextHubManager: Rename Callback class." into nyc-dev
am: b8768ac

* commit 'b8768acda2e6fd48e969226728acd3dbcc1082a1':
  ContextHubManager: Rename Callback class.
2016-03-18 19:08:54 +00:00
Greg Kaiser
b8768acda2 Merge "ContextHubManager: Rename Callback class." into nyc-dev 2016-03-18 19:02:54 +00:00
Jason Monk
4a6611be16 Merge "Fix QS FBE-ness" into nyc-dev am: 1ce2abc
am: 86f853c

* commit '86f853cac76d7954a69d1dd5ec47f4938ebda0b2':
  Fix QS FBE-ness
2016-03-18 18:50:58 +00:00
Tony Mantler
2f69f042e0 Merge "Add safe-mode reboot to PowerManager" into nyc-dev am: e6e08b4
am: 6f61fd5

* commit '6f61fd538ece71095c686d73991d91138bb5e011':
  Add safe-mode reboot to PowerManager
2016-03-18 18:50:56 +00:00
Jason Monk
86f853cac7 Merge "Fix QS FBE-ness" into nyc-dev
am: 1ce2abc

* commit '1ce2abcf6d0a34e49a0c5fc5198c9c5a07a022b4':
  Fix QS FBE-ness
2016-03-18 18:48:33 +00:00