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

278321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
589c217580 Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." into nyc-mr2-dev 2016-11-18 19:59:42 +00:00
Selim Cinek
61e2ff5727 Merge "Share one receiver for CurrentUserTracker" am: 06d619ccfa 
am: a84c7ea396

Change-Id: I54ca8022b6aeb15329d7a432300eaa758ea4b8ac
 2016-11-18 19:57:20 +00:00
Selim Cinek
3212624a6b Merge "Brightness mirror - fix multi-touch issue" am: 1bfab3de31 
am: 44857962dc

Change-Id: Ie5f7a865b3ed1d17444b5133ad530ae6191294a9
 2016-11-18 19:56:27 +00:00
Selim Cinek
a84c7ea396 Merge "Share one receiver for CurrentUserTracker" 
am: 06d619ccfa

Change-Id: I4b0dc5398b0be804663ebd633070a38cc51ec7de
 2016-11-18 19:51:23 +00:00
Selim Cinek
44857962dc Merge "Brightness mirror - fix multi-touch issue" 
am: 1bfab3de31

Change-Id: I5906d89a1c4e1343dbdbf99f328a5356b4f2be85
 2016-11-18 19:50:27 +00:00
Selim Cinek
06d619ccfa Merge "Share one receiver for CurrentUserTracker" 2016-11-18 19:39:30 +00:00
Selim Cinek
1bfab3de31 Merge "Brightness mirror - fix multi-touch issue" 2016-11-18 19:39:10 +00:00
Erik Wolsheimer
d2fbbacee9 Merge "Enable swipe to dismiss for watch devices." into cw-f-dev am: d841ee9c81 
am: 53f88c7826

Change-Id: Ib2e5908ffdd6f9b251a48cf78c1ba6d61ddb4381
 2016-11-18 19:31:32 +00:00
Michael Kwan
07e8c18ff8 Enable swipe to dismiss for watch devices. am: 686de42711 
am: ba28331c3a

Change-Id: I1a11c42470c21dced393428eeb5206f34cc8cbc3
 2016-11-18 19:30:25 +00:00
Erik Wolsheimer
53f88c7826 Merge "Enable swipe to dismiss for watch devices." into cw-f-dev 
am: d841ee9c81

Change-Id: Ic2bd153e8ba12b6e4aff380c20c7ecf5dea09791
 2016-11-18 19:24:32 +00:00
Michael Kwan
ba28331c3a Enable swipe to dismiss for watch devices. 
am: 686de42711

Change-Id: I3f9b9dcf8f7094bcf59eec643a5f87922486371e
 2016-11-18 19:24:27 +00:00
Erik Wolsheimer
d841ee9c81 Merge "Enable swipe to dismiss for watch devices." into cw-f-dev 2016-11-18 19:17:56 +00:00
Felipe Leme
7e45541244 DO NOT MERGE ANYWHERE - Clear preferences when package is removed. 
(cherry pick of commits 2154caf2f80fa87df84813b8e344f85094a454fd and
da1fc0a9c23697cc255efdccc47862bd1277da3f).

Change-Id: I5a019d771da6ff52ea36ee683a44405f6ea24853
Bug: 30900628
Bug: 28722556
Fixes: 32972310
(cherry picked from commit 20488d97cdc9aa7e98f6fd75c2890ba18781654a)
 2016-11-18 18:33:39 +00:00
Scott Main
22a15906f9 Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359 am: c8b11fb7cb am: 192a8c4973 am: 97be8864e5 am: ec9f41356c 
am: e42d88323a

Change-Id: Ic5587ed1d9d4932133a2017c1cf9fc4a5373a2ff
 2016-11-18 17:32:12 +00:00
Jack Yu
b141077015 Merge "Added configuration for VT downgrade/tear down when data disabled" into nyc-mr2-dev 
am: d97ccb1c0b

Change-Id: I9a7a78640c5ca7a25d80764ce980ae38a5abcead
 2016-11-18 17:30:47 +00:00
Jack Yu
cba59432ba resolve merge conflicts of 80a0e6d to nyc-mr2-dev-plus-aosp 
Test: telephony unit tests
Change-Id: Id4454c97eca5f0261001369d0ec5030775bf9887
 2016-11-18 09:23:00 -08:00
Scott Main
e42d88323a Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359 am: c8b11fb7cb am: 192a8c4973 am: 97be8864e5 
am: ec9f41356c

Change-Id: I7cd3a82a73707b1f61c82897c0e7fbc63f33d226
 2016-11-18 15:42:08 +00:00
Scott Main
ec9f41356c Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359 am: c8b11fb7cb am: 192a8c4973 
am: 97be8864e5

Change-Id: I340207420e0811c74751a96dc30e929a411ea207
 2016-11-18 15:36:33 +00:00
Scott Main
97be8864e5 Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359 am: c8b11fb7cb 
am: 192a8c4973

Change-Id: Ib54b2bafcf87a4f27e6a541a4cde0b01c41780b0
 2016-11-18 15:30:06 +00:00
Scott Main
192a8c4973 Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359 
am: c8b11fb7cb

Change-Id: I6db78aa2008d2bdd675a87daeae132e5f5c09371
 2016-11-18 15:24:18 +00:00
Scott Main
c8b11fb7cb Add cross-links between FINE and COARSE location permissions. bug: 25371600 
am: 3fef783359

Change-Id: I7a7e25c37fcd7863f51ea116f624d0bdc2d0c5c6
 2016-11-18 15:17:06 +00:00
Peter Qiu
b011af9573 Merge "wifi: hotspot2: add support for validating passpoint configuration" am: ebb722d04a am: 8bbb583ff7 
am: 1b3a17c280

Change-Id: Id2e1d703f3c87fb02ff439a68f388b7fc5a93ea3
 2016-11-18 09:05:13 +00:00
Peter Qiu
1b3a17c280 Merge "wifi: hotspot2: add support for validating passpoint configuration" am: ebb722d04a 
am: 8bbb583ff7

Change-Id: I50cd0f4c92b30cd649626dad1a1288619d6b03e5
 2016-11-18 08:59:09 +00:00
Peter Qiu
8bbb583ff7 Merge "wifi: hotspot2: add support for validating passpoint configuration" 
am: ebb722d04a

Change-Id: Ic20a77103961bd9ff61b6af90130c25ad19c451a
 2016-11-18 08:54:11 +00:00
Treehugger Robot
ebb722d04a Merge "wifi: hotspot2: add support for validating passpoint configuration" 2016-11-18 08:45:15 +00:00
TreeHugger Robot
d97ccb1c0b Merge "Added configuration for VT downgrade/tear down when data disabled" into nyc-mr2-dev 2016-11-18 06:05:00 +00:00
Ricky Wai
b5ddc22675 Catch KeyStoreException for setting profile lock am: c8fa5ed8f2 am: 3b546019dc 
am: c40b9a8ee2

Change-Id: Ibbdef0242e12ba5e942cb8162e21a34fa30c9a92
 2016-11-18 01:47:06 +00:00
Ricky Wai
c40b9a8ee2 Catch KeyStoreException for setting profile lock am: c8fa5ed8f2 
am: 3b546019dc

Change-Id: Id668766a96473ae2f68e83dae1ecb547b26de6fc
 2016-11-18 01:43:01 +00:00
Chris Tate
f053fc7133 Merge "Schedule agentDisconnected() in handler thread" am: c02a4a4613 am: 72a838e704 
am: 18d0df806e

Change-Id: I04b3f4a130f611c917f478e7c31b857a413641b7
 2016-11-18 01:42:39 +00:00
Chris Tate
18d0df806e Merge "Schedule agentDisconnected() in handler thread" am: c02a4a4613 
am: 72a838e704

Change-Id: I2eda02ea14fb67b1a0192750ae3885ec89f14564
 2016-11-18 01:38:05 +00:00
Ricky Wai
3b546019dc Catch KeyStoreException for setting profile lock 
am: c8fa5ed8f2

Change-Id: I28777d9d80ba13df463e05b95dd2524633554c9d
 2016-11-18 01:38:04 +00:00
Chris Tate
72a838e704 Merge "Schedule agentDisconnected() in handler thread" 
am: c02a4a4613

Change-Id: I1e2da0be53678a791dd16be5d00caa5e712fa036
 2016-11-18 01:33:29 +00:00
Chris Tate
c02a4a4613 Merge "Schedule agentDisconnected() in handler thread" 2016-11-18 01:23:31 +00:00
Michael Kwan
7e04fca2c7 DO NOT MERGE ANYWHERE Add supports-multiwindow command to am. 
am: 77ad3429a6  -s ours

Change-Id: I81e8e5d02c0039a9bdd2ef1632fc5f36c3ec3317
 2016-11-18 01:19:15 +00:00
John Reck
39d001dff8 Merge "Avoid starving RT anims" am: f77c220aa9 am: 7269372d5f 
am: 91d1bbce59

Change-Id: Ie4bf34f84a09e3147edba6ad099338fa82adc5ca
 2016-11-18 00:44:26 +00:00
John Reck
91d1bbce59 Merge "Avoid starving RT anims" am: f77c220aa9 
am: 7269372d5f

Change-Id: Ife1e7ea95055d8179b4a622dc4dabce382575b5b
 2016-11-18 00:28:54 +00:00
John Reck
7269372d5f Merge "Avoid starving RT anims" 
am: f77c220aa9

Change-Id: I3d4ba24ae0e6de4683d47163fd8f3bf65b98bd17
 2016-11-18 00:14:05 +00:00
Yifan Hong
c46d1b44eb Split libhidl into base and transport. 
Bug: 32756130

Test: mma
Change-Id: I0df309a1096b663cc51ce8badacf05e2a47836a8
 2016-11-18 00:03:59 +00:00
Ricky Wai
c8fa5ed8f2 Catch KeyStoreException for setting profile lock 
When device upgrades from L->N, sid(in gatekeeper) could be 0
even primary profile screenlock is set.
We are now trying to catch the exception so when sid==0 happens,
it will try to tie profile lock again when primary profile is unlocked.

Bug: 32490092
Change-Id: I73011d872ac15e7e09be9bda0165cf7f6a75493a
 2016-11-18 00:02:24 +00:00
Treehugger Robot
f77c220aa9 Merge "Avoid starving RT anims" 2016-11-17 23:53:00 +00:00
Michael Kwan
77ad3429a6 DO NOT MERGE ANYWHERE Add supports-multiwindow command to am. 
The supports-multiwindow command allows the ability to
check if the device has multiwindow support in the shell.

Bug: 30120559
Change-Id: I466e28d8a794fa457826a6526ef9ef660cd3856c
 2016-11-17 23:16:36 +00:00
John Reck
a5b7b89166 Avoid starving RT anims 
Test: Manual, usleep(16000) in DrawFrameTask and tap
on recents

Merged-In: I88bb30a2503bc908ec45650c7d36b6fb3cc750d0

Change-Id: I88bb30a2503bc908ec45650c7d36b6fb3cc750d0
 2016-11-17 22:05:22 +00:00
Brad Ebinger
75553432d4 Merge "Readability improvements in Logging" am: d51df736f6 am: 90b6e78657 
am: 3ae84b6efe

Change-Id: I7eba86dfbf8845aae8bafddc4a6bc5f94b66bc2b
 2016-11-17 19:43:08 +00:00
Brad Ebinger
3ae84b6efe Merge "Readability improvements in Logging" am: d51df736f6 
am: 90b6e78657

Change-Id: I51e87f2a8146e1e60d3610bbdc791b40fc8ba972
 2016-11-17 19:35:08 +00:00
Brad Ebinger
90b6e78657 Merge "Readability improvements in Logging" 
am: d51df736f6

Change-Id: If7bb6955d615b8369ac41d3bb8ba96aa0cc752d2
 2016-11-17 19:29:17 +00:00
Brad Ebinger
d51df736f6 Merge "Readability improvements in Logging" 2016-11-17 19:18:00 +00:00
Dimitry Ivanov
c8ff9b50ed Merge "Fix coretests: Remove dependency on libnativehelper" am: f68cb55cc1 am: 6a5e1a7f4a 
am: b8e43f60c2

Change-Id: I449cd9a5ceabb13abce3a5d345137025fca33579
 2016-11-17 19:06:02 +00:00
Dimitry Ivanov
b8e43f60c2 Merge "Fix coretests: Remove dependency on libnativehelper" am: f68cb55cc1 
am: 6a5e1a7f4a

Change-Id: I096fb9b30c2e11bf7054aefa1bd3deb6974a9d36
 2016-11-17 18:57:58 +00:00
Dimitry Ivanov
6a5e1a7f4a Merge "Fix coretests: Remove dependency on libnativehelper" 
am: f68cb55cc1

Change-Id: I06e1b8acbe6772ea80bb9c6ab6704e6ce678c3cc
 2016-11-17 18:50:29 +00:00
Treehugger Robot
f68cb55cc1 Merge "Fix coretests: Remove dependency on libnativehelper" 2016-11-17 18:37:42 +00:00