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

157975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rich Slogar
e6e140abfb am 3aa8271a: am 4f62925e: am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984 
* commit '3aa8271afc20fb3a7cbdd3c317029963ad41c512':
 2014-11-03 20:45:29 +00:00
smain@google.com
07d46a3880 am 7c2f87ec: am 0646885d: am c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs automerge: 90ab19b 
* commit '7c2f87ec560c4b75f8750a6fa9b81cdef51be8c6':
 2014-11-03 20:45:24 +00:00
Rich Slogar
3aa8271afc am 4f62925e: am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984 
* commit '4f62925ecb2f049aec7392f84d494328f883cb92':
 2014-11-03 20:37:59 +00:00
smain@google.com
7c2f87ec56 am 0646885d: am c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs automerge: 90ab19b 
* commit '0646885ddfb5c04cd0c5276e66b51b1a14691c4c':
 2014-11-03 20:37:55 +00:00
Rich Slogar
4f62925ecb am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984 
* commit 'a34b1f15292d219b6e2c13fd6f685735c8dd8f8c':
 2014-11-03 20:29:55 +00:00
smain@google.com
0646885ddf am c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs automerge: 90ab19b 
* commit 'c64c937a18be1205170ad95b7f601a6e0192b9b9':
 2014-11-03 20:29:51 +00:00
Rich Slogar
a34b1f1529 am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 
automerge: f07d984

* commit 'f07d984fed70be0718e7e9019bc933f58fbeca46':
 2014-11-03 20:21:20 +00:00
smain@google.com
c64c937a18 am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs 
automerge: 90ab19b

* commit '90ab19bb8dec2e444e274ab4c8990545b481ca7b':
 2014-11-03 20:20:13 +00:00
Joe Fernandez
1c337a11d7 am 2cc032d5: am badfcbec: am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs 
* commit '2cc032d5ea8650ff22b58b05bb19e9cc039b872e':
  docs: Update Android Dashboard for November 2014
 2014-11-03 20:05:06 +00:00
Jim Miller
ff25dd06a3 am 12b239e6: Merge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-dev 
* commit '12b239e6d39ad5a35f68e7bcd5f644a793b5cb74':
  Fix SetupWizard black screen issue for EDU devices
 2014-11-03 20:00:43 +00:00
Joe Fernandez
2cc032d5ea am badfcbec: am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs 
* commit 'badfcbec48e6904316bec731e22c52bb7cca25fb':
  docs: Update Android Dashboard for November 2014
 2014-11-03 19:57:46 +00:00
Jim Miller
12b239e6d3 Merge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-dev 2014-11-03 19:51:53 +00:00
Joe Fernandez
badfcbec48 am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs 
* commit '4f8399c7ad4f7e14e3846494c9aa2b88bfd343d9':
  docs: Update Android Dashboard for November 2014
 2014-11-03 19:51:42 +00:00
Joe Fernandez
4f8399c7ad am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs 
* commit 'eff5efac2170e05b2a5e197788bf455edee57cce':
  docs: Update Android Dashboard for November 2014
 2014-11-03 19:41:56 +00:00
Joe Fernandez
eff5efac21 Merge "docs: Update Android Dashboard for November 2014" into lmp-docs 2014-11-03 19:37:20 +00:00
Joe Fernandez
9dc852ac69 docs: Update Android Dashboard for November 2014 
Change-Id: I42b4c58ebfe2b6f486c560d4ccf698d8064d1d39
 2014-11-03 11:33:28 -08:00
Mike Lockwood
61cf7e0fe7 am 946863b6: Merge "Fix USB audio disconnect logic" into lmp-mr1-dev 
* commit '946863b63c05eb3ea38f422d5a198e95b0cc2aaa':
  Fix USB audio disconnect logic
 2014-11-03 18:44:12 +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
Mike Lockwood
946863b63c Merge "Fix USB audio disconnect logic" into lmp-mr1-dev 2014-11-03 18:38:14 +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
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
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
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
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
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
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
Scott Rowe
cd796536ce Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs 2014-11-03 16:24:38 +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