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

166382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
8a8a40556e am 541641d0: Merge "Fix counting" into lmp-mr1-dev 
automerge: 5c8d135

* commit '5c8d135920896af42de8d8b91975abe3fa871cd9':
  Fix counting
 2014-11-03 18:42:30 +00:00
Adrian Roos
70fd44fa02 am 698078a7: Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev 
automerge: 7736d37

* commit '7736d37568980fdcee9c261de8a207977a720bb9':
  Improve TrustManagerService user lifecycle
 2014-11-03 18:41:28 +00:00
John Reck
5c8d135920 am 541641d0: Merge "Fix counting" into lmp-mr1-dev 
* commit '541641d0334546d61bca13125ab2a36380dc662d':
  Fix counting
 2014-11-03 18:39:51 +00:00
Adrian Roos
7736d37568 am 698078a7: Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev 
* commit '698078a7e9a59d5e4cf959a761ccb9a74377cfa4':
  Improve TrustManagerService user lifecycle
 2014-11-03 18:39:46 +00:00
John Reck
541641d033 Merge "Fix counting" into lmp-mr1-dev 2014-11-03 18:35:59 +00:00
Adrian Roos
698078a7e9 Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev 2014-11-03 18:33:54 +00:00
John Reck
88f5fc7c5a Fix counting 
Change-Id: I9a3568908a7223d69430c1765fb5a4db96d7ac9c
 2014-11-03 10:32:24 -08:00
John Reck
43973c9d73 am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev 
automerge: 9280480

* commit '928048040cb5cd205ff5e74f9393dca2371c519a':
  Fix cancel crash
 2014-11-03 18:32:20 +00:00
John Reck
928048040c am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev 
* commit '1787b4ea436f361e16c289755fa1a35c6e1c8845':
  Fix cancel crash
 2014-11-03 18:31:17 +00:00
John Reck
1787b4ea43 Merge "Fix cancel crash" into lmp-mr1-dev 2014-11-03 18:27:41 +00:00
Geoff Mendal
d90238eb15 am 188416bf: (-s ours) am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
automerge: 2589d8e  -s ours

* commit '2589d8e12de80535defb6e8ddae5ca971a64feb5':
  Import translations. DO NOT MERGE
 2014-11-03 18:08:15 +00:00
Geoff Mendal
2589d8e12d am 188416bf: (-s ours) am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '188416bf38a2531158a8447f0f7b5719f22a39fd':
  Import translations. DO NOT MERGE
 2014-11-03 18:06:55 +00:00
Geoff Mendal
188416bf38 am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '2d7e612ed1df3580d35cfc94bbcba660f0f058e2':
  Import translations. DO NOT MERGE
 2014-11-03 18:01:46 +00:00
John Reck
55b46eff39 Fix cancel crash 
Bug: 18059003
Change-Id: I579468fbd1645049f8fbe335faf4da1f2d3bb0a3
 2014-11-03 10:00:33 -08:00
Geoff Mendal
cd43c99cce am ef8c3cc4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: 3765ae9  -s ours

* commit '3765ae9ff1a7584623f5f4c69d50bdf011664f81':
  Import translations. DO NOT MERGE
 2014-11-03 17:57:24 +00:00
Geoff Mendal
3765ae9ff1 am ef8c3cc4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'ef8c3cc4f663875f6b5c62364d4bc61080d3a23d':
  Import translations. DO NOT MERGE
 2014-11-03 17:54:25 +00:00
Geoff Mendal
ffada671db Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: 6bdbeba  -s ours

* commit '6bdbebadad9a1e7452c7ec6b67db3ce760093e39':
  Import translations. DO NOT MERGE
 2014-11-03 17:54:09 +00:00
Geoff Mendal
2d7e612ed1 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-03 17:53:12 +00:00
Geoff Mendal
6bdbebadad Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-03 17:52:57 +00:00
Geoff Mendal
ef8c3cc4f6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-03 17:52:11 +00:00
Ricardo Cervera
ad8415e4ec am d68bdd6b: am 6ff586f7: am fa37321f: am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs 
automerge: 73d5b5f

* commit '73d5b5f2e3547498f8fc7f98a09fab4bd2398884':
  docs: Add links to Wear UI training from Design pages.
 2014-11-03 17:47:52 +00:00
Ricardo Cervera
73d5b5f2e3 am d68bdd6b: am 6ff586f7: am fa37321f: am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs 
* commit 'd68bdd6bfa720a2837161bd66a456a07a640a774':
  docs: Add links to Wear UI training from Design pages.
 2014-11-03 17:46:17 +00:00
Ricardo Cervera
d68bdd6bfa am 6ff586f7: am fa37321f: am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs 
* commit '6ff586f71b03b658096e51fdbc17274044341713':
  docs: Add links to Wear UI training from Design pages.
 2014-11-03 17:41:45 +00:00
Ricardo Cervera
6ff586f71b am fa37321f: am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs 
* commit 'fa37321f05ad96a1de6863bc08fe1e496cceea9e':
  docs: Add links to Wear UI training from Design pages.
 2014-11-03 17:36:56 +00:00
Ricardo Cervera
fa37321f05 am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs 
* commit '3e621914cacf692700dce007ec7d7893fcc12a8c':
  docs: Add links to Wear UI training from Design pages.
 2014-11-03 17:31:32 +00:00
Scott Rowe
c1c58b9a96 am 1117098b: am d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs 
automerge: aa3be67

* commit 'aa3be670328ee9ff7e1fbd3ec077ff27ddf42013':
  docs: b/18119632 isGame, b/18119595 banner
 2014-11-03 17:29:59 +00:00
Casey Burkhardt
1031eb71cc am 5e2986ef: am 2997285f: Merge "Disable circular display mask with color inversion" into lmp-sprout-dev 
automerge: fb80a3b

* commit 'fb80a3b2fd3e8094d2b4f70d375c1a0603d0b047':
  Disable circular display mask with color inversion
 2014-11-03 17:28:59 +00:00
Scott Rowe
aa3be67032 am 1117098b: am d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs 
* commit '1117098b6186de95d98f649e4cd1b56debb3efbd':
  docs: b/18119632 isGame, b/18119595 banner
 2014-11-03 17:27:27 +00:00
Casey Burkhardt
fb80a3b2fd am 5e2986ef: am 2997285f: Merge "Disable circular display mask with color inversion" into lmp-sprout-dev 
* commit '5e2986ef2067fd24c10f100858d166353a46caba':
  Disable circular display mask with color inversion
 2014-11-03 17:27:20 +00:00
Ricardo Cervera
3e621914ca Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs 2014-11-03 17:27:09 +00:00
Scott Rowe
1117098b61 am d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs 
* commit 'd4e3825a83764f9692f833c73915c310f83e38eb':
  docs: b/18119632 isGame, b/18119595 banner
 2014-11-03 17:22:26 +00:00
Casey Burkhardt
5e2986ef20 am 2997285f: Merge "Disable circular display mask with color inversion" into lmp-sprout-dev 
* commit '2997285f362349097882d1b31eb23cb867227192':
  Disable circular display mask with color inversion
 2014-11-03 17:22:13 +00:00
Geoff Mendal
a958819b73 Import translations. DO NOT MERGE 
Change-Id: Ia68d4e853864dd44c7531374c30794d4a0bbd8a3
Auto-generated-cl: translation import
 2014-11-03 09:10:40 -08:00
Geoff Mendal
b47c651ef7 Import translations. DO NOT MERGE 
Change-Id: Ic1fb3518c1b06345d69abacb9164ae4a52dcf270
Auto-generated-cl: translation import
 2014-11-03 09:07:58 -08:00
Adrian Roos
cbe614ff7d Improve TrustManagerService user lifecycle 
- Only bind agents of running users
- Explicitly clean up state when users are removed
- Delay binding until third-party apps can actually run

Bug: 18102460
Change-Id: I5017adc1634b249068099fc5779ba95904312438
 2014-11-03 18:07:11 +01:00
Geoff Mendal
d2c26c9d7f Import translations. DO NOT MERGE 
Change-Id: I21e1890c7ff4490469fb0243df69b560db9b29b6
Auto-generated-cl: translation import
 2014-11-03 09:06:30 -08:00
Scott Rowe
d4e3825a83 am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs 
* commit '1b2cf3f8f64013441fc021db45e00381d4b2d19b':
  docs: b/18119632 isGame, b/18119595 banner
 2014-11-03 17:00:31 +00:00
Casey Burkhardt
2997285f36 Merge "Disable circular display mask with color inversion" into lmp-sprout-dev 2014-11-03 16:55:27 +00:00
Scott Rowe
1b2cf3f8f6 am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs 
* commit 'cd796536ce81fe6f8a63c3867b57e7b7f92a8542':
  docs: b/18119632 isGame, b/18119595 banner
 2014-11-03 16:54:29 +00:00
Narayan Kamath
f2459e2e16 am 10ac55ba: am 5f8099ed: Merge "Add java.util.List import." 
* commit '10ac55ba4f0beed608b310c473bb052cbcdf19c1':
  Add java.util.List import.
 2014-11-03 16:52:41 +00:00
Scott Rowe
cd796536ce Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs 2014-11-03 16:24:38 +00:00
Narayan Kamath
10ac55ba4f am 5f8099ed: Merge "Add java.util.List import." 
* commit '5f8099ed181c2ba279c4a747096442389d5f8840':
  Add java.util.List import.
 2014-11-03 16:00:57 +00:00
Narayan Kamath
5f8099ed18 Merge "Add java.util.List import." 2014-11-03 15:57:17 +00:00
Narayan Kamath
2b4378fef8 Add java.util.List import. 
Unused on master but used downstream.

Change-Id: I7c072e25d1f7c3a645efb2986d23e81068dced22
 2014-11-03 15:55:03 +00:00
Adrian Roos
1814f14c7d am 808fe6f9: Merge "Fix colored status bar panning issues" into lmp-mr1-dev 
automerge: fcad9e1

* commit 'fcad9e17413da20db95a2cccbfc8641d2f30a4e6':
  Fix colored status bar panning issues
 2014-11-03 15:48:21 +00:00
Adrian Roos
fcad9e1741 am 808fe6f9: Merge "Fix colored status bar panning issues" into lmp-mr1-dev 
* commit '808fe6f99fba753e0ec4c5e90de0ff7a2140e8a6':
  Fix colored status bar panning issues
 2014-11-03 15:47:01 +00:00
Adrian Roos
808fe6f99f Merge "Fix colored status bar panning issues" into lmp-mr1-dev 2014-11-03 15:44:08 +00:00
Geoff Mendal
d5334e9f0e am dde49a4f: (-s ours) am c95236de: (-s ours) Import translations. DO NOT MERGE 
automerge: c35e962  -s ours

* commit 'c35e9620edd2a214185ecd208ae58ee3a18d4678':
  Import translations. DO NOT MERGE
 2014-11-03 15:13:16 +00:00
Geoff Mendal
c35e9620ed am dde49a4f: (-s ours) am c95236de: (-s ours) Import translations. DO NOT MERGE 
* commit 'dde49a4fe8ae9a4736d171efbadb067e7d4cc81d':
  Import translations. DO NOT MERGE
 2014-11-03 15:12:00 +00:00
Geoff Mendal
dde49a4fe8 am c95236de: (-s ours) Import translations. DO NOT MERGE 
* commit 'c95236deadfed31966661c7ed5c5db7422b3d0dc':
  Import translations. DO NOT MERGE
 2014-11-03 15:07:50 +00:00