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

179904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
f76ea8e4f9 am c2d95052: am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a automerge: 8eb3060 automerge: cca3d44 
* commit 'c2d950521919f35c75d60013276fb422789151a2':
  docs: Fix broken link in Common Intents
 2015-01-13 20:33:19 +00:00
Craig Mautner
91934a3b2f am 19c549fc: am 1e263d3f: am 66b4d484: Merge "Prevent system server dump stuck by pipe buffer full." 
* commit '19c549fc735bf8a1df5cccb6cc0cdf46c7d242a4':
  Prevent system server dump stuck by pipe buffer full.
 2015-01-13 20:33:08 +00:00
Alan Viverette
cb4a489fd1 am 4ecb5fb2: am 82bdfcfa: Update docs for Window.setElevation(), apply changes immediately automerge: 71922de 
* commit '4ecb5fb288fd9994e7b2ec0091fbbcdc81f69526':
  Update docs for Window.setElevation(), apply changes immediately
 2015-01-13 20:33:02 +00:00
Elliott Hughes
c2b7abdbb2 am 1e147221: am d6c475dc: am 595ae39f: Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK." 
* commit '1e14722167210e176cc1f6e702f1a7a98271c6d2':
  Use more intention-revealing tests for S_ISLNK and S_ISSOCK.
 2015-01-13 20:32:52 +00:00
Ricardo Cervera
abccd9d3c9 am 5849c0e4: am 9a19ed17: am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs automerge: cb09d8d 
* commit '5849c0e4c6f8bf44de44e964ce365c0959070494':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-13 20:32:15 +00:00
Wale Ogunwale
3c0e7e908f am 00c85656: am 42b0d10a: am 1ea6afe1: Merge "Don\'t allow windows with invalid types to be added." into lmp-mr1-dev 
* commit '00c8565614d3555e723ff3d8dad3af92d69d81ea':
  Don't allow windows with invalid types to be added.
 2015-01-13 20:32:07 +00:00
Joe Fernandez
07b4bfac5d am e3c10bf9: am d15b54d2: am 0bb84bb5: am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs automerge: d3b6d61 
* commit 'e3c10bf96c93672831a1126dea66b81eb52f7a43':
  docs: Removing obsolete L-Preview docs and images
 2015-01-13 20:31:54 +00:00
Joe Fernandez
67e0249df0 am eabea18e: am 520a3c82: am acd5f3ab: am 1946978c: am 76110e7c: docs: Remove Wear preview reference docs automerge: 56c56f7 
* commit 'eabea18ee897313c10091a653db3762321c3a40c':
  docs: Remove Wear preview reference docs
 2015-01-13 20:31:48 +00:00
Yang Ni
fdf3f43c58 am ae0278e9: am cc9efb78: am 21454aa2: Merge "New Script Group API." 
* commit 'ae0278e96627d3fee51b11988defb46c3ea23a7c':
  New Script Group API.
 2015-01-13 20:31:44 +00:00
Jason Monk
44f397efcf am 2168062b: am 0a1eb640: Merge "Carrier text handle sim removal" into lmp-mr1-dev automerge: a50a668 
* commit '2168062b23c8c343330f9a7b074a51efc4780cde':
  Carrier text handle sim removal
 2015-01-13 20:31:32 +00:00
Ruchi Kandoi
22c0b4bc3e Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-01-13 20:31:30 +00:00
Prashant Malani
5c090ad791 am 0142097a: am b71f9f96: Merge "Improve the circularMask for round displays" into lmp-mr1-dev automerge: 4212bf1 
* commit '0142097a0335b7839cf807c6e520b474811caa11':
  Improve the circularMask for round displays
 2015-01-13 20:30:41 +00:00
Prashant Malani
cd414c2931 am b71f9f96: Merge "Improve the circularMask for round displays" into lmp-mr1-dev automerge: 4212bf1 
automerge: 0142097

* commit '0142097a0335b7839cf807c6e520b474811caa11':
  Improve the circularMask for round displays
 2015-01-13 20:30:03 +00:00
Eric Gilmore
f8e8fc5fb2 am c6a22851: am 3fca2e7f: am 10b829e1: am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs automerge: 39b167a 
automerge: 85ac9f1

* commit '85ac9f153b3b1e2d1ed0c0fa571fe3dde5de8bd2':
  Adding Android Fundamentals video.
 2015-01-13 20:28:40 +00:00
Geoff Mendal
73ffaeb2af Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: 8858db6 -s ours 
automerge: eb99c82  -s ours

* commit 'eb99c8260252a90ff329f834b3b18088236d53f2':
  Import translations. DO NOT MERGE
 2015-01-13 20:26:39 +00:00
Eric Gilmore
1ff978a239 am c726557c: am 2c7e5631: am 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs automerge: 1908515 
automerge: 979dc00

* commit '979dc00bb9061d4bf448b9880096a323d06f19dd':
  Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
 2015-01-13 20:23:29 +00:00
Neil Fuller
bd151d0842 am f5f345cf: am 837261cc: Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade." 
automerge: 60b268f

* commit '60b268f039857211333e2ea1cc68e795a12d7e07':
  Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade.
 2015-01-13 20:21:37 +00:00
Olawale Ogunwale
be37df395e am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG receiver finished" 
automerge: 0f8ecc8

* commit '0f8ecc84c8b86054bfd3275f942c3a705df01fbb':
  [ActivityManager] Distinguish FG or BG receiver finished
 2015-01-13 20:19:57 +00:00
Olawale Ogunwale
01e2fda02d am cacf5564: am e3f85985: Merge "bindService can\'t start up service process" 
automerge: d362d19

* commit 'd362d1936434148f332ab8c6c9c92c38aac0dac8':
  bindService can't start up service process
 2015-01-13 20:17:58 +00:00
Olawale Ogunwale
7dfe83d396 am a9ae5050: am 8ddd5f4c: Merge "[ActivityManager] Fix process record leakage." 
automerge: d07b9ea

* commit 'd07b9ea63dc37eaaf28bdf91b2edae62e2b35ee1':
  [ActivityManager] Fix process record leakage.
 2015-01-13 20:16:40 +00:00
Geoff Mendal
16fb7a3cfe am 3d9875f4: (-s ours) Import translations. DO NOT MERGE automerge: 83c2c04 -s ours 
automerge: 60d791c  -s ours

* commit '60d791c8640b30331ee710551e5fdc642fb432ff':
  Import translations. DO NOT MERGE
 2015-01-13 20:14:58 +00:00
Eric Laurent
cba9873ee2 Merge commit 'fe254b6e' into manualmerge 
Change-Id: If26269b8356155a0cb4c364c971866ec3b7e4ca6
 2015-01-13 11:54:38 -08:00
Ricardo Cervera
c2d9505219 am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a automerge: 8eb3060 
automerge: cca3d44

* commit 'cca3d44b700db945e23ad357b031d7f6397e18b9':
  docs: Fix broken link in Common Intents
 2015-01-13 17:01:48 +00:00
Ricardo Cervera
cca3d44b70 am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a 
automerge: 8eb3060

* commit '8eb306077d603baae0d8e00a909f97275f83f3db':
  docs: Fix broken link in Common Intents
 2015-01-13 16:55:00 +00:00
Ricardo Cervera
8eb306077d am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a 
* commit '62ceea31564ac27c84ff78b400f844be98917c29':
  docs: Fix broken link in Common Intents
 2015-01-13 16:49:57 +00:00
Ricardo Cervera
62ceea3156 am f5569413: docs: Fix broken link in Common Intents 
automerge: c2d373a

* commit 'c2d373a0a7bb45e8c8a282781c5bc4f75db86b7d':
  docs: Fix broken link in Common Intents
 2015-01-13 16:42:22 +00:00
Ricardo Cervera
c2d373a0a7 am f5569413: docs: Fix broken link in Common Intents 
* commit 'f556941357ea391cae6dcd2e22b71a837a216d06':
  docs: Fix broken link in Common Intents
 2015-01-13 16:35:04 +00:00
Ricardo Cervera
f556941357 docs: Fix broken link in Common Intents 
Bug: 18991366

Change-Id: I998e5213bb7117ebd26ab335206f430f60d1c537
 2015-01-13 08:28:22 -08:00
Ben Wagner
4eec25af42 Merge "Remove dead code from AssetStreamAdapter." 2015-01-13 14:53:34 +00:00
Jason Monk
49accefb6f resolve merge conflicts of afeefb6 to master. 
Change-Id: I754a8439f77e4f9e2f636c5b7a04280a01721c95
 2015-01-13 09:15:17 -05:00
Craig Mautner
19c549fc73 am 1e263d3f: am 66b4d484: Merge "Prevent system server dump stuck by pipe buffer full." 
* commit '1e263d3f140e90966790875a815f23c92550f2f2':
  Prevent system server dump stuck by pipe buffer full.
 2015-01-13 04:20:23 +00:00
Craig Mautner
1e263d3f14 am 66b4d484: Merge "Prevent system server dump stuck by pipe buffer full." 
* commit '66b4d48469c74f7dd889f3f685b436fcb957bf16':
  Prevent system server dump stuck by pipe buffer full.
 2015-01-13 04:14:01 +00:00
Craig Mautner
66b4d48469 Merge "Prevent system server dump stuck by pipe buffer full." 2015-01-13 04:08:05 +00:00
Alan Viverette
4ecb5fb288 am 82bdfcfa: Update docs for Window.setElevation(), apply changes immediately automerge: 71922de 
* commit '82bdfcfadc17b8467a0e3c50843997e7957a9452':
  Update docs for Window.setElevation(), apply changes immediately
 2015-01-13 02:24:11 +00:00
Alan Viverette
82bdfcfadc Update docs for Window.setElevation(), apply changes immediately 
automerge: 71922de

* commit '71922de6c8e407ff24bb1a500cb53bb1a647c758':
  Update docs for Window.setElevation(), apply changes immediately
 2015-01-13 02:16:32 +00:00
Elliott Hughes
1e14722167 am d6c475dc: am 595ae39f: Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK." 
* commit 'd6c475dc246b1681f5c9af9e00ac74183812329c':
  Use more intention-revealing tests for S_ISLNK and S_ISSOCK.
 2015-01-13 01:32:37 +00:00
Elliott Hughes
d6c475dc24 am 595ae39f: Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK." 
* commit '595ae39f7f484eb5d2d9e21feeff7e97114b744a':
  Use more intention-revealing tests for S_ISLNK and S_ISSOCK.
 2015-01-13 01:18:48 +00:00
Elliott Hughes
595ae39f7f Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK." 2015-01-13 01:13:00 +00:00
Alan Viverette
71922de6c8 Update docs for Window.setElevation(), apply changes immediately 
BUG: 18983689
Change-Id: I471104092d6296dc0ba2689da96783be088fbce8
 2015-01-12 16:14:02 -08:00
Ben Wagner
c2d39573ca Remove dead code from AssetStreamAdapter. 
After "Use at least SkStreamAsset for SkTypefaces." there is now dead
code in AssetStreamAdapter. Remove the code and update the users.

Change-Id: I17a9d82dd6ca4d87a951c1570dc91de7f2fc54f2
 2015-01-12 18:13:27 -05:00
Elliott Hughes
1bf2481233 Use more intention-revealing tests for S_ISLNK and S_ISSOCK. 
Change-Id: Ia7f13eb7d5a36cf2b4c0a253b2b4d7f7af396951
 2015-01-12 14:33:04 -08:00
Ricardo Cervera
5849c0e4c6 am 9a19ed17: am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
automerge: cb09d8d

* commit 'cb09d8d08a3628561a58f19713b9358eafa32738':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 22:26:58 +00:00
Ricardo Cervera
cb09d8d08a am 9a19ed17: am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
* commit '9a19ed17e1f36894aac8250dcf9649998d9c2603':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 22:22:59 +00:00
Wale Ogunwale
00c8565614 am 42b0d10a: am 1ea6afe1: Merge "Don\'t allow windows with invalid types to be added." into lmp-mr1-dev 
* commit '42b0d10a83dae285a3d3af9911aa35a90db203d0':
  Don't allow windows with invalid types to be added.
 2015-01-12 22:22:05 +00:00
Ricardo Cervera
9a19ed17e1 am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
* commit 'eec6dd779ca170a80ff457828e2687da834d2c1f':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 22:16:09 +00:00
Wale Ogunwale
42b0d10a83 am 1ea6afe1: Merge "Don\'t allow windows with invalid types to be added." into lmp-mr1-dev 
* commit '1ea6afe1234b04de0f5b3f9ac5802b1c6d42e8ac':
  Don't allow windows with invalid types to be added.
 2015-01-12 22:15:58 +00:00
Wale Ogunwale
1ea6afe123 Merge "Don't allow windows with invalid types to be added." into lmp-mr1-dev 2015-01-12 22:03:50 +00:00
Wale Ogunwale
74bf065e43 Don't allow windows with invalid types to be added. 
Bug: 18950225
Change-Id: Ia7ead72d036c7628e0a97f8fe9fef2a35525e4df
 2015-01-12 14:01:25 -08:00
Ricardo Cervera
eec6dd779c am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
* commit 'a87f35555d4aca13902a334691815cfa462feb30':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 21:59:33 +00:00
Ricardo Cervera
a87f35555d am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
* commit 'd8bd117ce017d7e9b967d7949f8ca3e661e2cd39':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 21:53:27 +00:00