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

148782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
b0b8e700c5 am abd9de9f: am 388b2e22: am c23b9298: Merge "Fix NPE in DevicePolicyManagerService that crashed SystemUI" into lmp-dev 
* commit 'abd9de9fe450679e539d103ab9d2ea64fd1d50a2':
  Fix NPE in DevicePolicyManagerService that crashed SystemUI
 2014-08-07 14:20:49 +00:00
Adrian Roos
3b0592aa44 am 388b2e22: am c23b9298: Merge "Fix NPE in DevicePolicyManagerService that crashed SystemUI" into lmp-dev 
* commit '388b2e227c1bd2459f2cbdaeaf1856674e2fb73e':
  Fix NPE in DevicePolicyManagerService that crashed SystemUI
 2014-08-07 14:17:14 +00:00
Dan Sandler
6b639422a6 am d1b8aba1: am 9ae5ba6b: am 78688688: Merge "Fix screenshots." into lmp-dev 
* commit 'd1b8aba15526c4be079ee4076e77c69eea31932c':
  Fix screenshots.
 2014-08-07 14:16:43 +00:00
Dan Sandler
d37017c48a am 9ae5ba6b: am 78688688: Merge "Fix screenshots." into lmp-dev 
* commit '9ae5ba6bccd918ec8add91987d778ebcdd7e749d':
  Fix screenshots.
 2014-08-07 14:13:14 +00:00
Adrian Roos
68c01cb6ba am c23b9298: Merge "Fix NPE in DevicePolicyManagerService that crashed SystemUI" into lmp-dev 
* commit 'c23b9298ad3544aba73a426c47e84988c709aaeb':
  Fix NPE in DevicePolicyManagerService that crashed SystemUI
 2014-08-07 14:12:53 +00:00
Adrian Roos
afc625a679 am 06407eb4: am 4902e5ff: am ae9b5cd0: Merge "Pass initiatedByUser to TrustListeners" into lmp-dev 
* commit '06407eb441b71d0dd62f38cef72aba140944b711':
  Pass initiatedByUser to TrustListeners
 2014-08-07 14:09:33 +00:00
Dan Sandler
2531b787ff am 78688688: Merge "Fix screenshots." into lmp-dev 
* commit '7868868812a8c383476fa8d2997f3acb3bde5865':
  Fix screenshots.
 2014-08-07 14:08:55 +00:00
Adrian Roos
692d041f0c am 4902e5ff: am ae9b5cd0: Merge "Pass initiatedByUser to TrustListeners" into lmp-dev 
* commit '4902e5ff1cbefa3b2e8a07b434873344a45b21d3':
  Pass initiatedByUser to TrustListeners
 2014-08-07 14:04:25 +00:00
Adrian Roos
e901a1540d am ae9b5cd0: Merge "Pass initiatedByUser to TrustListeners" into lmp-dev 
* commit 'ae9b5cd05215910b69624d028b4288eb50972175':
  Pass initiatedByUser to TrustListeners
 2014-08-07 14:00:20 +00:00
Zoltan Szatmary-Ban
5576e855bf am 084a1161: am f947b96e: am a37d2244: Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev 
* commit '084a11612dd1b1958f4421315e3929657723f7c9':
  Revert "Update Trusted Credentials screen in settings"
 2014-08-07 13:53:10 +00:00
Zoltan Szatmary-Ban
bdbd4a55ef am d9d6bfe9: am d76cefa2: am 74535f61: Merge "Update Trusted Credentials screen in settings" into lmp-dev 
* commit 'd9d6bfe92f37b7ba82c3ad1f5a28ad16ee67e221':
  Update Trusted Credentials screen in settings
 2014-08-07 13:53:05 +00:00
Zoltan Szatmary-Ban
2fe77f5393 am f947b96e: am a37d2244: Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev 
* commit 'f947b96e5b3fcc97cbfb58bc6dae51eebf6a2cd0':
  Revert "Update Trusted Credentials screen in settings"
 2014-08-07 13:49:27 +00:00
Zoltan Szatmary-Ban
47f90bee09 am d76cefa2: am 74535f61: Merge "Update Trusted Credentials screen in settings" into lmp-dev 
* commit 'd76cefa2c6e9454db9339f4a710cdfbdb28f2d74':
  Update Trusted Credentials screen in settings
 2014-08-07 13:49:22 +00:00
Zoltan Szatmary-Ban
5a54a51567 am a37d2244: Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev 
* commit 'a37d22442a9472fc59d1f0be224e40627c7300b2':
  Revert "Update Trusted Credentials screen in settings"
 2014-08-07 13:45:35 +00:00
Zoltan Szatmary-Ban
2e5bfc5204 am 74535f61: Merge "Update Trusted Credentials screen in settings" into lmp-dev 
* commit '74535f61795732de57b7562d7c9bf4510c981d78':
  Update Trusted Credentials screen in settings
 2014-08-07 13:45:30 +00:00
Calin Juravle
090ee11755 am 85eac0c7: am 29965e18: (-s ours) am 7f935726: Merge "Use native ISA for dex code (in case there\'s a NativeBridge)" 
* commit '85eac0c7faf908cdc3b8b566fdbf604c1668a82e':
  Use native ISA for dex code (in case there's a NativeBridge)
 2014-08-07 13:34:04 +00:00
Calin Juravle
4df09f6ece am 29965e18: (-s ours) am 7f935726: Merge "Use native ISA for dex code (in case there\'s a NativeBridge)" 
* commit '29965e18ee158c55b4adeded2a72f4b226be94ef':
  Use native ISA for dex code (in case there's a NativeBridge)
 2014-08-07 13:30:29 +00:00
Adrian Roos
6114f763ad am ba68d800: am d9f0372e: am 5d07fda1: Merge "Update User switcher to new spec, implement adding users" into lmp-dev 
* commit 'ba68d8001a1e3a789ce71b544d8d65f13358c605':
  Update User switcher to new spec, implement adding users
 2014-08-07 12:58:29 +00:00
Adrian Roos
2d6ae3453f am d9f0372e: am 5d07fda1: Merge "Update User switcher to new spec, implement adding users" into lmp-dev 
* commit 'd9f0372e41ed87105306d89b825041b56030558b':
  Update User switcher to new spec, implement adding users
 2014-08-07 12:54:41 +00:00
Adrian Roos
1e9bee23ee am 5d07fda1: Merge "Update User switcher to new spec, implement adding users" into lmp-dev 
* commit '5d07fda13caedfe14ed9a39e87d27e5d54982fa0':
  Update User switcher to new spec, implement adding users
 2014-08-07 12:51:20 +00:00
Calin Juravle
29965e18ee am 7f935726: Merge "Use native ISA for dex code (in case there\'s a NativeBridge)" 
* commit '7f93572650d939a416588a17baab87906d310c40':
  Use native ISA for dex code (in case there's a NativeBridge)
 2014-08-07 12:50:12 +00:00
Dan Sandler
a909b28a13 Merge "Fix screenshots." into lmp-dev 2014-08-07 12:44:12 +00:00
Dan Sandler
deb0d11a43 Fix screenshots. 
Bug: 16861182
Change-Id: I9433cb4a5cc100d85f06eeed18ade3ead5ba8188
 2014-08-07 09:24:03 -04:00
Adrian Roos
0da7093840 Merge "Pass initiatedByUser to TrustListeners" into lmp-dev 2014-08-07 12:44:12 +00:00
Adrian Roos
3c9a350165 Pass initiatedByUser to TrustListeners 
Bug: 16840500
Change-Id: I8d9bd8fe9a305066f33ac5c888d8a41ce219a6f1
 2014-08-07 15:13:09 +02:00
Zoltan Szatmary-Ban
138b324d5d Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev 2014-08-07 12:44:12 +00:00
Zoltan Szatmary-Ban
678e3ecc93 Revert "Update Trusted Credentials screen in settings" 
This reverts commit 4fde5aa9fab931d9becfc49f7d7b8526ad5640d9.

Change-Id: I581c38d64e9829b0079bafa42615f2aa0bf64763
 2014-08-07 13:41:08 +00:00
Robin Lee
05a7e45495 am 19e9aaa0: am d4fe9b9e: am 000ef01c: Merge "Permit crash report button for user profiles" into lmp-dev 
* commit '19e9aaa0a9277879d05dda29e0f6c8cab22498b5':
  Permit crash report button for user profiles
 2014-08-07 10:46:18 +00:00
Robin Lee
e00b50a56b am d4fe9b9e: am 000ef01c: Merge "Permit crash report button for user profiles" into lmp-dev 
* commit 'd4fe9b9ebfeb5de0a4212f694561512d237890d6':
  Permit crash report button for user profiles
 2014-08-07 10:42:34 +00:00
Robin Lee
60317382b3 am 000ef01c: Merge "Permit crash report button for user profiles" into lmp-dev 
* commit '000ef01cdf74e1b95d28be2a465fe69ac747843b':
  Permit crash report button for user profiles
 2014-08-07 10:38:28 +00:00
Ji-Hwan Lee
c484247259 am 5905db23: am 9ae60bd5: am 1d0fc352: TIF: Handle setMainSession for TV input wrapper services 
* commit '5905db2327611f32de452c1309b083b7f8c29d88':
  TIF: Handle setMainSession for TV input wrapper services
 2014-08-07 10:21:04 +00:00
Ji-Hwan Lee
8a0e4933de am 9ae60bd5: am 1d0fc352: TIF: Handle setMainSession for TV input wrapper services 
* commit '9ae60bd5476bcc3a63d0e3b7196b3482b36fefbb':
  TIF: Handle setMainSession for TV input wrapper services
 2014-08-07 10:16:55 +00:00
Ji-Hwan Lee
4bba00b592 am 1d0fc352: TIF: Handle setMainSession for TV input wrapper services 
* commit '1d0fc352aa10c1f97c8ff03445ebd8e701e4eff7':
  TIF: Handle setMainSession for TV input wrapper services
 2014-08-07 10:13:02 +00:00
Esteban Talavera
62b24865c1 am 48ecef05: am 25759079: am cc22fede: Merge "Wipe only managed profile when max number of incorrect passwords exceeded" into lmp-dev 
* commit '48ecef05b8b0998ab1bcb9e1729730b7fa4067de':
  Wipe only managed profile when max number of incorrect passwords exceeded
 2014-08-07 10:13:02 +00:00
Esteban Talavera
42b49fb27f am 25759079: am cc22fede: Merge "Wipe only managed profile when max number of incorrect passwords exceeded" into lmp-dev 
* commit '25759079529c158481a48e2a353b62f6f74f8e64':
  Wipe only managed profile when max number of incorrect passwords exceeded
 2014-08-07 10:09:23 +00:00
Ji-Hwan Lee
956afc2ba7 TIF: Handle setMainSession for TV input wrapper services 
Bug: 15994065
Change-Id: I46b3c0a89be92036f2c3849a412075caf587ec5c
 2014-08-07 10:05:30 +00:00
Esteban Talavera
8d5e98821c am cc22fede: Merge "Wipe only managed profile when max number of incorrect passwords exceeded" into lmp-dev 
* commit 'cc22fede5a45c2702496a7dce41aeab51275c9f4':
  Wipe only managed profile when max number of incorrect passwords exceeded
 2014-08-07 10:04:17 +00:00
Robin Lee
5975433076 am 1a6d648f: am e625c298: am e07e39b7: Disallow switching managed profile to foreground 
* commit '1a6d648f923675bc2e8deb370dc535810ad7cce4':
  Disallow switching managed profile to foreground
 2014-08-07 09:32:43 +00:00
Robin Lee
830733083b am e625c298: am e07e39b7: Disallow switching managed profile to foreground 
* commit 'e625c2986f238af3729aa4fe81e36cd948b541e9':
  Disallow switching managed profile to foreground
 2014-08-07 09:29:48 +00:00
Adrian Roos
04e5f72cdb Merge "Update User switcher to new spec, implement adding users" into lmp-dev 2014-08-07 09:28:12 +00:00
Calin Juravle
7f93572650 Merge "Use native ISA for dex code (in case there's a NativeBridge)" 2014-08-07 09:28:10 +00:00
Robin Lee
e272aa9512 am e07e39b7: Disallow switching managed profile to foreground 
* commit 'e07e39b75b8a25549ff9ab70f228e101727b4db2':
  Disallow switching managed profile to foreground
 2014-08-07 09:25:14 +00:00
Yuncheol Heo
b583fce1c9 am 62ab5967: am 95246acc: am b0e4ff34: Allow to use device\'s own physical address. 
* commit '62ab5967e2ceb682a4b22841d30cd381ccd614ea':
  Allow to use device's own physical address.
 2014-08-07 09:22:02 +00:00
Yuncheol Heo
93aa8452f0 am d062cf02: am a3820a32: am a566b462: Go to nap when receiving <Active Source> for the other devices. 
* commit 'd062cf02a01aa7ba8a9587b36e812abfec603d39':
  Go to nap when receiving <Active Source> for the other devices.
 2014-08-07 09:16:48 +00:00
Terry Heo
6cc6691ab9 am 70c709ed: am 71289d85: am e2a42d17: TIF: Add system API \'isSingleSessionActive()\' 
* commit '70c709edd7f2e281dd1804c5f0113dea7c639ca0':
  TIF: Add system API 'isSingleSessionActive()'
 2014-08-07 09:16:43 +00:00
Yuncheol Heo
79d6ac1409 am 95246acc: am b0e4ff34: Allow to use device\'s own physical address. 
* commit '95246acc677abb3b0947743ce6eb9a80c86c3ec5':
  Allow to use device's own physical address.
 2014-08-07 09:15:48 +00:00
Robin Lee
faa4b3cb06 Disallow switching managed profile to foreground 
Another check in the ActivityManager to stop us from getting into an
invalid state by a fat-fingered 'am switch' etc.

@bug 16814252

Change-Id: Id65ab647d5a535cc2f965139a1b717cf65aa7e69
 2014-08-07 10:15:45 +01:00
Yuncheol Heo
88f061d400 am b0e4ff34: Allow to use device\'s own physical address. 
* commit 'b0e4ff34405ce270356f1975da845a408258e280':
  Allow to use device's own physical address.
 2014-08-07 09:10:51 +00:00
Yuncheol Heo
b03eef56ae am a3820a32: am a566b462: Go to nap when receiving <Active Source> for the other devices. 
* commit 'a3820a32f6c3843f390d36bb49df02bc64ca7be9':
  Go to nap when receiving <Active Source> for the other devices.
 2014-08-07 09:09:55 +00:00
Terry Heo
ae146bd38f am 71289d85: am e2a42d17: TIF: Add system API \'isSingleSessionActive()\' 
* commit '71289d85c65b911c8e96472b82ab3c1cbc0f1f49':
  TIF: Add system API 'isSingleSessionActive()'
 2014-08-07 09:09:51 +00:00