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

146729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
964c3cf5b2 Add default propagation back to Explode. 
Bug 16217557

Change-Id: I47460db128749af978077755a777068392492aee
 2014-07-29 14:13:00 +00:00
Adrian Roos
2ddc0d8c12 am e29906bc: am c7af998e: Merge "Make TrustAgentService a SystemApi" into lmp-dev 
* commit 'e29906bc01756e991cdf76f509fb4c38a79c6c90':
  Make TrustAgentService a SystemApi
 2014-07-29 13:29:12 +00:00
Adrian Roos
796762e827 am c7af998e: Merge "Make TrustAgentService a SystemApi" into lmp-dev 
* commit 'c7af998e0719da01c4656a57e7bf1b44af640b9e':
  Make TrustAgentService a SystemApi
 2014-07-29 13:19:13 +00:00
Narayan Kamath
5f6c9def12 am c2a635f5: am 676513ad: Merge "Fix regression in renderscript detection." into lmp-dev 
* commit 'c2a635f525fc3229d4f1037b02d9f478c4d3c111':
  Fix regression in renderscript detection.
 2014-07-29 13:16:46 +00:00
Jorim Jaggi
ecdf1292c7 am 1a456466: am 2e0d19f1: Remove WindowManager.LayoutParams.TYPE_KEYGUARD (1/2) 
* commit '1a456466257bc55e100edca8f1b3e5dd610ef7b7':
  Remove WindowManager.LayoutParams.TYPE_KEYGUARD (1/2)
 2014-07-29 13:16:38 +00:00
Narayan Kamath
11b86083e3 am 676513ad: Merge "Fix regression in renderscript detection." into lmp-dev 
* commit '676513ad1f865b137d3f053602748867afe40b0f':
  Fix regression in renderscript detection.
 2014-07-29 13:08:44 +00:00
Zoltan Szatmary-Ban
4446c5d7e9 am 6358906e: am 9635719f: Update Data Usage Settings for Enterprise 
* commit '6358906e16784429ad23cfc1411f7f5c858bc610':
  Update Data Usage Settings for Enterprise
 2014-07-29 13:07:13 +00:00
Jim Miller
ba93cac951 am 112121f6: am 502aab60: Merge "Add new DevicePolicyManager API to allow fine-grained TrustAgent management" into lmp-dev 
* commit '112121f68bed83ccac204751182f5aa3c3243401':
  Add new DevicePolicyManager API to allow fine-grained TrustAgent management
 2014-07-29 13:07:08 +00:00
Jorim Jaggi
ee73547e1b am 2e0d19f1: Remove WindowManager.LayoutParams.TYPE_KEYGUARD (1/2) 
* commit '2e0d19f133ffbae6f5f40f7acae5601f33b4c895':
  Remove WindowManager.LayoutParams.TYPE_KEYGUARD (1/2)
 2014-07-29 13:01:28 +00:00
Zoltan Szatmary-Ban
34f3b71357 am 9635719f: Update Data Usage Settings for Enterprise 
* commit '9635719fc8e9d5fbd053693e2a7ace9086141e57':
  Update Data Usage Settings for Enterprise
 2014-07-29 12:49:31 +00:00
Jim Miller
1e8d54d55c am 502aab60: Merge "Add new DevicePolicyManager API to allow fine-grained TrustAgent management" into lmp-dev 
* commit '502aab60c8c8f9d57c7a3b6a9468975adb6fc3a2':
  Add new DevicePolicyManager API to allow fine-grained TrustAgent management
 2014-07-29 12:48:38 +00:00
Jorim Jaggi
e411fdfa4c Remove WindowManager.LayoutParams.TYPE_KEYGUARD (1/2) 
Change-Id: I5d234dc4383bbf205bde1a0e7f1e8266fc37d13a
 2014-07-29 14:43:03 +02:00
Zoltan Szatmary-Ban
e37e43d0bd Update Data Usage Settings for Enterprise 
Applications of the managed profile are shown
with badged icon on the "Data Usage" app list.
A total of managed profile data usage (if any)
is displayed top of the list.

Bug: 15466834

Change-Id: Ie75fb0ddc240ea1e5d1097feda7b7b5931256fcb
 2014-07-29 10:21:43 +01:00
vandwalle
b7d1f49cc0 am 1960d77b: am 5029e1f3: Merge "fix typo in scanresult" into lmp-dev 
* commit '1960d77b6d485e929792f334125b602cbe4fdee7':
  fix typo in scanresult
 2014-07-29 04:05:29 +00:00
vandwalle
5c593ab1df am 5029e1f3: Merge "fix typo in scanresult" into lmp-dev 
* commit '5029e1f37def8ebbf4e80e44d8b5e10a222987af':
  fix typo in scanresult
 2014-07-29 04:01:30 +00:00
vandwalle
b8c70cf59a am 7d74649c: am c7c85579: Merge "add debug info to wificonfiguration dump" into lmp-dev 
* commit '7d74649cae32662f2ab6a438f3583812b05740f5':
  add debug info to wificonfiguration dump
 2014-07-29 03:46:30 +00:00
vandwalle
01990135b2 am c7c85579: Merge "add debug info to wificonfiguration dump" into lmp-dev 
* commit 'c7c8557933bd3b14c4ff03d4f7df9d78a136b746':
  add debug info to wificonfiguration dump
 2014-07-29 03:42:18 +00:00
John Spurlock
8ab8cece9d am 0ae3a12a: am 0eeaaa39: Merge "Zen: Classify notifications using the alarm stream." into lmp-dev 
* commit '0ae3a12af03e47372353b1e1301a8b7f01bece2b':
  Zen: Classify notifications using the alarm stream.
 2014-07-29 03:42:10 +00:00
Sailesh Nepal
fdbf66dd2d am 9655ba41: am 66928fc9: Merge "Fix WTF when creating a lazily initialized connection" into lmp-dev 
* commit '9655ba416bf7eedc7a4a6847eb044275f77f12ce':
  Fix WTF when creating a lazily initialized connection
 2014-07-29 03:42:05 +00:00
John Spurlock
73a8ae3cea am 0eeaaa39: Merge "Zen: Classify notifications using the alarm stream." into lmp-dev 
* commit '0eeaaa39d06777adf5133b6dd0c037d93584f9a6':
  Zen: Classify notifications using the alarm stream.
 2014-07-29 03:38:03 +00:00
Sailesh Nepal
a0dbc5366d am 66928fc9: Merge "Fix WTF when creating a lazily initialized connection" into lmp-dev 
* commit '66928fc9d90534598528b91c0628245d3c1d77fc':
  Fix WTF when creating a lazily initialized connection
 2014-07-29 03:37:58 +00:00
John Spurlock
005f6d2196 am 0c38e849: am e78d5af1: Merge "Settings: Constants for notification settings." into lmp-dev 
* commit '0c38e849c8e3f6bd5318273930685ad3534d9cc4':
  Settings: Constants for notification settings.
 2014-07-29 02:19:51 +00:00
John Spurlock
d22c30cc3e am e78d5af1: Merge "Settings: Constants for notification settings." into lmp-dev 
* commit 'e78d5af1b7ffc819eff52afff82e11453295e01d':
  Settings: Constants for notification settings.
 2014-07-29 02:15:23 +00:00
Sailesh Nepal
eff8be3c48 am 602d06d6: am 53522516: Handle synchronous failed connection 
* commit '602d06d681c323ddccaf170a9e3b3e6764dab33a':
  Handle synchronous failed connection
 2014-07-29 01:59:26 +00:00
Sailesh Nepal
b61eae1d19 am 53522516: Handle synchronous failed connection 
* commit '535225161324a4da618d6c12597ec95948916351':
  Handle synchronous failed connection
 2014-07-29 01:55:56 +00:00
Sailesh Nepal
4e7ec71e64 Handle synchronous failed connection 
Change-Id: I406ccbdd1f70c85456b6e0d689332cf40a756707
 2014-07-29 01:46:57 +00:00
Filip Gruszczynski
ea0951106a am d1b641bb: am 005ec21c: am 896a82d7: am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 
* commit 'd1b641bb66a462d3ed1d86b750b0b41f0518f068':
  Fix double chin issue, where bottom inset is applied twice.
 2014-07-29 01:18:41 +00:00
Craig Mautner
7286596d26 am be6e5f89: am 842e4132: am 09875ec7: am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 
* commit 'be6e5f89d3ad475de0ef6ae50a6652d70fabe2d6':
  Remove PendingActivityLaunches based on stack.
 2014-07-29 01:18:28 +00:00
Filip Gruszczynski
c6f72ec4eb am 005ec21c: am 896a82d7: am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 
* commit '005ec21c2c56434c8fd81243a7e3a11d68176501':
  Fix double chin issue, where bottom inset is applied twice.
 2014-07-29 01:14:34 +00:00
Craig Mautner
f7035e5cd7 am 842e4132: am 09875ec7: am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 
* commit '842e41322daa8edc387372dfea76f05506da7235':
  Remove PendingActivityLaunches based on stack.
 2014-07-29 01:14:30 +00:00
Filip Gruszczynski
0fa59b898a am 896a82d7: am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 
* commit '896a82d77e732c7387b2279bcdd0f04d696b13df':
  Fix double chin issue, where bottom inset is applied twice.
 2014-07-29 01:08:09 +00:00
Craig Mautner
7544c82997 am 09875ec7: am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 
* commit '09875ec7292b19e07c38b6127406d6aa7490e26c':
  Remove PendingActivityLaunches based on stack.
 2014-07-29 01:07:59 +00:00
Robert Greenwalt
51650f3d18 am eae2110e: am 89a20049: Merge "Remove dead code 3." into lmp-dev 
* commit 'eae2110e9e62d2286ed04093712b199e07e6bbf8':
  Remove dead code 3.
 2014-07-29 01:05:39 +00:00
Robert Greenwalt
9049775700 am 89a20049: Merge "Remove dead code 3." into lmp-dev 
* commit '89a200494f82371c1238d21a23c22a6ec5d41e82':
  Remove dead code 3.
 2014-07-29 00:59:59 +00:00
John Spurlock
95ef3579b3 am 68c0abaa: am 5c93904b: Zen: follow independent ringer mode changes. 
* commit '68c0abaa8d0f26116a80c812262186ab87a0a295':
  Zen: follow independent ringer mode changes.
 2014-07-29 00:56:12 +00:00
Sreeram Ramachandran
732ff98d2c am 632c22fe: am bce2867e: Allow VPNs to add/remove link addresses dynamically. 
* commit '632c22fe2a7c9f0f39fcedd26a42fea099f699df':
  Allow VPNs to add/remove link addresses dynamically.
 2014-07-29 00:56:08 +00:00
Riley Andrews
de9b8c3a59 am 42c85a7a: am d85845c6: Merge "Add cursor flags into SpriteController to suppor async cursor updates. - This is fairly blindly taken from nvidia\'s implementation." into lmp-dev 
* commit '42c85a7a57e301cc6725f70f609eefcff17a4991':
  Add cursor flags into SpriteController to suppor async cursor updates. - This is fairly blindly taken from nvidia's implementation.
 2014-07-29 00:47:57 +00:00
John Spurlock
25a27c7d3a am 5c93904b: Zen: follow independent ringer mode changes. 
* commit '5c93904b3aee698306d67521446d72ece3a4ef96':
  Zen: follow independent ringer mode changes.
 2014-07-29 00:47:55 +00:00
Winson Chung
deb2766169 am 119535bb: am 7097f6e8: Merge "Updating lock-to-app look." into lmp-dev 
* commit '119535bb7b4d6e519984c19af452da1bdd15d372':
  Updating lock-to-app look.
 2014-07-29 00:47:53 +00:00
Sreeram Ramachandran
aa19b10ec7 am bce2867e: Allow VPNs to add/remove link addresses dynamically. 
* commit 'bce2867ef034e8b658d809dca76194456990b328':
  Allow VPNs to add/remove link addresses dynamically.
 2014-07-29 00:47:51 +00:00
John Spurlock
8c01d88208 Zen: follow independent ringer mode changes. 
Bug:16624498
Change-Id: Ib623118970a82c8406c714687b1b516378fe7824
 2014-07-28 20:39:17 -04:00
Sreeram Ramachandran
f4e0c0cb8e Allow VPNs to add/remove link addresses dynamically. 
Bug: 15409819
Change-Id: If91fc6891d7ce04060362c6cde8c57462394c4e8
 2014-07-29 00:32:59 +00:00
Riley Andrews
49d06dccc6 am d85845c6: Merge "Add cursor flags into SpriteController to suppor async cursor updates. - This is fairly blindly taken from nvidia\'s implementation." into lmp-dev 
* commit 'd85845c6e00fb56d618f280b8ff7a03c12af8623':
  Add cursor flags into SpriteController to suppor async cursor updates. - This is fairly blindly taken from nvidia's implementation.
 2014-07-28 23:59:13 +00:00
Filip Gruszczynski
896a82d77e am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 
* commit 'd0e03392394164e1e261ef8829e187ad2362d426':
  Fix double chin issue, where bottom inset is applied twice.
 2014-07-28 23:40:13 +00:00
Christopher Tate
6b69eb90c1 am fb9e3c46: am 3c4efc3e: Merge "Provide outside-facing API for data management intent+label" into lmp-dev 
* commit 'fb9e3c462e9da4a4e56ca79d264d00381e40443e':
  Provide outside-facing API for data management intent+label
 2014-07-28 23:33:24 +00:00
Craig Mautner
09875ec729 am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 
* commit '0fa45d93f7265c130d5dc49a51130ed74db5cec9':
  Remove PendingActivityLaunches based on stack.
 2014-07-28 23:28:59 +00:00
Baligh Uddin
f515b0b77c am aa694fcd: (-s ours) am 43fa0c1a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'aa694fcdbe230c0b2065e99d30fb3d1336534d32':
  Import translations. DO NOT MERGE
 2014-07-28 23:27:26 +00:00
Baligh Uddin
b4529e8c21 am 4a8cfcf1: (-s ours) am e47f344c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '4a8cfcf14433549e6849494e529c3fb9dcd57ccd':
  Import translations. DO NOT MERGE
 2014-07-28 23:27:21 +00:00
Baligh Uddin
b6ee4dbeb6 am 6469ed75: (-s ours) am c7fa2051: (-s ours) Import translations. DO NOT MERGE 
* commit '6469ed75123924318aa1c0d46481a9238ae9a892':
  Import translations. DO NOT MERGE
 2014-07-28 23:27:17 +00:00
Winson Chung
12b1a4047a am 7097f6e8: Merge "Updating lock-to-app look." into lmp-dev 
* commit '7097f6e8d539d8694ed815b83936ed3d21ff057d':
  Updating lock-to-app look.
 2014-07-28 23:27:09 +00:00