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

206043 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
76c71ab419 am e1f19370: am e7b37bc2: am 5c8072df: am ebbc891a: Merge "Fix build." into mnc-dev 
* commit 'e1f19370ff1a64eeda3fd147663d6ac7fe093406':
  Fix build.
 2015-08-01 17:04:52 +00:00
Glenn Kasten
0536eef883 am a2f5ed7f: am 4dffe462: am 22057e06: am 37f559be: Merge "Improve getTimestamp documentation" into mnc-dev 
* commit 'a2f5ed7f815a1d2118a1d730578222e05394e79d':
  Improve getTimestamp documentation
 2015-08-01 17:04:45 +00:00
Dianne Hackborn
80d0df7cd9 am 62f05dfa: am 55a23950: am e8d3b394: am 692a244b: Fix build. 
* commit '62f05dfa6f3763479d289d747114c34832ab10f6':
  Fix build.
 2015-08-01 17:04:37 +00:00
Dianne Hackborn
628b412584 am bc2a8843: am b97c5ddd: am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev 
* commit 'bc2a88431e3dc51e2245cc28e327f11d0c78bd56':
  Change MNC codename to just M.
 2015-08-01 17:04:28 +00:00
Jorim Jaggi
647569d440 am 0a7844db: am 703dc46e: am f1518da4: Fix fingerprint icon screen on animation 
* commit '0a7844db4059dd17be28216410f214f2a46951a8':
  Fix fingerprint icon screen on animation
 2015-08-01 17:04:20 +00:00
Dianne Hackborn
e1f19370ff am e7b37bc2: am 5c8072df: am ebbc891a: Merge "Fix build." into mnc-dev 
* commit 'e7b37bc20ec4ddb775b2af243a859e59da877423':
  Fix build.
 2015-08-01 16:52:37 +00:00
Glenn Kasten
a2f5ed7f81 am 4dffe462: am 22057e06: am 37f559be: Merge "Improve getTimestamp documentation" into mnc-dev 
* commit '4dffe462592bb8cda93ad8bee87829283e29f353':
  Improve getTimestamp documentation
 2015-08-01 16:52:30 +00:00
Dianne Hackborn
62f05dfa6f am 55a23950: am e8d3b394: am 692a244b: Fix build. 
* commit '55a2395004e3ab45bd6e27b3b1ff528aa828bc28':
  Fix build.
 2015-08-01 16:52:24 +00:00
Dianne Hackborn
bc2a88431e am b97c5ddd: am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev 
* commit 'b97c5ddd2a828b6cadc4243ee902d533a5fae332':
  Change MNC codename to just M.
 2015-08-01 16:52:15 +00:00
Jorim Jaggi
0a7844db40 am 703dc46e: am f1518da4: Fix fingerprint icon screen on animation 
* commit '703dc46ebf38bc1211524a4afb67ffdfbba7c6ec':
  Fix fingerprint icon screen on animation
 2015-08-01 16:52:08 +00:00
Dianne Hackborn
e7b37bc20e am 5c8072df: am ebbc891a: Merge "Fix build." into mnc-dev 
* commit '5c8072df22bf9febcf2e8e08bf440341bf789991':
  Fix build.
 2015-08-01 16:35:13 +00:00
Glenn Kasten
4dffe46259 am 22057e06: am 37f559be: Merge "Improve getTimestamp documentation" into mnc-dev 
* commit '22057e06ac7fd00025c32e6e2c017fc8deff63cc':
  Improve getTimestamp documentation
 2015-08-01 16:35:08 +00:00
Dianne Hackborn
55a2395004 am e8d3b394: am 692a244b: Fix build. 
* commit 'e8d3b39467e139ae380f2821ab91aad6031f1410':
  Fix build.
 2015-08-01 16:35:02 +00:00
Dianne Hackborn
b97c5ddd2a am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev 
* commit '9b36f526dd0378bda8f71c0e51ed37bf97742f8f':
  Change MNC codename to just M.
 2015-08-01 16:34:48 +00:00
Jorim Jaggi
703dc46ebf am f1518da4: Fix fingerprint icon screen on animation 
* commit 'f1518da4512dcf350fd808a5288634f534bca1bb':
  Fix fingerprint icon screen on animation
 2015-08-01 16:34:09 +00:00
Dianne Hackborn
5c8072df22 am ebbc891a: Merge "Fix build." into mnc-dev 
* commit 'ebbc891ae4ca835dea278430e3bad42d4630e2af':
  Fix build.
 2015-07-31 19:42:50 +00:00
Glenn Kasten
22057e06ac am 37f559be: Merge "Improve getTimestamp documentation" into mnc-dev 
* commit '37f559be42ef7a765c671cc0852289a9d7e047cc':
  Improve getTimestamp documentation
 2015-07-31 19:42:43 +00:00
Dianne Hackborn
e8d3b39467 am 692a244b: Fix build. 
* commit '692a244bffea11157c37c8de93482cb912599b98':
  Fix build.
 2015-07-31 19:42:24 +00:00
Dianne Hackborn
9b36f526dd am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev 
* commit 'c1836bb0f1bf3e5ef0911719525da0bab3e53507':
  Change MNC codename to just M.
 2015-07-31 19:42:11 +00:00
Jorim Jaggi
f1518da451 Fix fingerprint icon screen on animation 
Bug: 22807015
Change-Id: I4685085007d87f1b1e1db380d0f899efc4e56240
 2015-07-31 19:31:16 +00:00
Dianne Hackborn
ebbc891ae4 Merge "Fix build." into mnc-dev 2015-07-31 18:19:11 +00:00
Dianne Hackborn
e5d926deb2 Fix build. 
Change-Id: I9c6b6cd354039ff2914837cfe97a783564ded66f
 2015-07-31 11:17:43 -07:00
Glenn Kasten
37f559be42 Merge "Improve getTimestamp documentation" into mnc-dev 2015-07-31 18:04:16 +00:00
Dianne Hackborn
692a244bff Fix build. 
Change-Id: Icdf6fa14e53a1c030d0d90205d3bf2d7610b6196
 2015-07-31 10:35:34 -07:00
Tyler Gunn
bd19c1bd92 am 4cfe2a8c: am f26ec92d: am a21b2e30: resolved conflicts for merge of d0694da4 to mnc-dr-dev 
* commit '4cfe2a8c0050a69e1793f41a60395b69277973b2':
  Add telecom extra keys required for DMR release.
 2015-07-31 17:22:33 +00:00
Dianne Hackborn
c1836bb0f1 Merge "Change MNC codename to just M." into mnc-dev 2015-07-31 17:11:58 +00:00
Tyler Gunn
4cfe2a8c00 am f26ec92d: am a21b2e30: resolved conflicts for merge of d0694da4 to mnc-dr-dev 
* commit 'f26ec92d9632868d37ea7aca9ad4a2474ae0a052':
  Add telecom extra keys required for DMR release.
 2015-07-31 17:11:07 +00:00
Tyler Gunn
f26ec92d96 am a21b2e30: resolved conflicts for merge of d0694da4 to mnc-dr-dev 
* commit 'a21b2e30b246b152b3b3692384de534ade2f3485':
  Add telecom extra keys required for DMR release.
 2015-07-31 17:01:57 +00:00
Tyler Gunn
a21b2e30b2 resolved conflicts for merge of d0694da4 to mnc-dr-dev 
Change-Id: Ifd2636d0e1b7eae15d412cfa0a948a572c905b3a
 2015-07-31 09:02:32 -07:00
Tyler Gunn
d0694da4fb Merge "Add telecom extra keys required for DMR release." into mnc-dev 2015-07-31 15:42:48 +00:00
Julia Reynolds
2a23ef2817 am 8ceb1188: am e787bfa2: am 9bc94698: am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev 
* commit '8ceb1188f17826088695ed488ad0ab58ec22afa2':
  Fix SysUI crash on device boot.
 2015-07-31 14:16:04 +00:00
Julia Reynolds
8ceb1188f1 am e787bfa2: am 9bc94698: am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev 
* commit 'e787bfa209a4fa6fc2f4cd754492a13472952c5c':
  Fix SysUI crash on device boot.
 2015-07-31 14:09:06 +00:00
Julia Reynolds
e787bfa209 am 9bc94698: am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev 
* commit '9bc9469807703757f50fffd34ed6b3f6183cdc6e':
  Fix SysUI crash on device boot.
 2015-07-31 14:02:01 +00:00
Julia Reynolds
9bc9469807 am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev 
* commit '5d6a2d387cd437e6d0c45d0df1bd10ba9db56253':
  Fix SysUI crash on device boot.
 2015-07-31 13:57:02 +00:00
Julia Reynolds
5d6a2d387c Merge "Fix SysUI crash on device boot." into mnc-dev 2015-07-31 13:49:26 +00:00
Rubin Xu
0550536b27 am 3eaf7d21: am 6501720c: am 489043d4: am 9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev 
* commit '3eaf7d2155d0c513eb08f66abc02f87b09659be7':
  Don't always transfer device owner status to other users.
 2015-07-31 13:33:39 +00:00
Rubin Xu
3eaf7d2155 am 6501720c: am 489043d4: am 9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev 
* commit '6501720c721f2a0997d7cdd45303ed14eb54ded7':
  Don't always transfer device owner status to other users.
 2015-07-31 13:28:42 +00:00
Rubin Xu
6501720c72 am 489043d4: am 9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev 
* commit '489043d49be1ea66b7714666193e69399cffa223':
  Don't always transfer device owner status to other users.
 2015-07-31 13:21:31 +00:00
Julia Reynolds
8478aba1a2 Fix SysUI crash on device boot. 
Bug: 22869066
Change-Id: I55ab64c430899ebc20bfc8a8e4d1e2a7cd12f0cd
 2015-07-31 09:17:20 -04:00
Rubin Xu
489043d49b am 9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev 
* commit '9a81a182df634ab7a087752c9a10db67c5d0f256':
  Don't always transfer device owner status to other users.
 2015-07-31 13:15:44 +00:00
Rubin Xu
9a81a182df Merge "Don't always transfer device owner status to other users." into mnc-dev 2015-07-31 13:11:08 +00:00
Benjamin Franz
33cb97c0f0 am 54aed521: am 93d45d1c: am 982daf87: am d692fcf1: Merge "Add missing return statement" into mnc-dev 
* commit '54aed5215d8542e7425c107e1bcdfea2dfa0fff8':
  Add missing return statement
 2015-07-31 10:01:34 +00:00
Benjamin Franz
54aed5215d am 93d45d1c: am 982daf87: am d692fcf1: Merge "Add missing return statement" into mnc-dev 
* commit '93d45d1c22d277abd182e01a7afee93b5015dbd6':
  Add missing return statement
 2015-07-31 09:56:13 +00:00
Benjamin Franz
93d45d1c22 am 982daf87: am d692fcf1: Merge "Add missing return statement" into mnc-dev 
* commit '982daf8769bf78dd6bb240dab9ac7d0a62de21cc':
  Add missing return statement
 2015-07-31 09:47:55 +00:00
Benjamin Franz
982daf8769 am d692fcf1: Merge "Add missing return statement" into mnc-dev 
* commit 'd692fcf115e57fef8a15c214fb2fcde78a48b45c':
  Add missing return statement
 2015-07-31 09:42:43 +00:00
Nicolas Prevot
e2a4a6ff8a Don't always transfer device owner status to other users. 
A device owner cannot use device or profile owner policies on
other users unless it is profile owner there. Also limit device
initializer to system apps only.

Bug: 21800830
Change-Id: Ie1abbd891945b91b17ecdf7f73ba93aaa19819be
 2015-07-31 09:32:15 +01:00
Benjamin Franz
d692fcf115 Merge "Add missing return statement" into mnc-dev 2015-07-31 08:22:53 +00:00
Lorenzo Colitti
5bbbf8edfd am 3b03916d: am c7a86e90: am c70348c1: am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev 
* commit '3b03916de7d1d2c91d5d8c9d1f0f555814a9242f':
  Stop supporting legacy ConnectivityManager routing methods in M.
 2015-07-31 05:43:26 +00:00
Lorenzo Colitti
3b03916de7 am c7a86e90: am c70348c1: am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev 
* commit 'c7a86e90ea5f61e9135e2f9acae0c5c3f37522fc':
  Stop supporting legacy ConnectivityManager routing methods in M.
 2015-07-31 05:37:15 +00:00
Lorenzo Colitti
c7a86e90ea am c70348c1: am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev 
* commit 'c70348c194a26176ac54720fe4eabeeb7e4d9993':
  Stop supporting legacy ConnectivityManager routing methods in M.
 2015-07-31 05:31:04 +00:00