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

94728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
2c64b53976 am 596532d9: Properly initialize recognition service if the recognizer component changed. 
* commit '596532d9dbea3460dbc989b0316c721ca69f4915':
  Properly initialize recognition service if the recognizer component changed.
 2013-01-22 15:43:53 -08:00
Amith Yamasani
596532d9db Properly initialize recognition service if the recognizer component changed. 
The getServiceInfo() call directly to IPackageManager does not throw an exception.
The return value needed to be checked for null.

Bug: 8031032
Change-Id: I701b9e8cf3b2406a3b35a486183330489b3d46f5
 2013-01-22 15:35:49 -08:00
Kenny Root
cc1fc6b6ad Track libcore changes for OpenSSLKey 
Change-Id: I39f60c34daa9ccc633efb02988ea238a84e6bbf1
 2013-01-22 15:22:56 -08:00
Elliott Hughes
b63e39a076 Merge "fix typo for symbol" 2013-01-22 23:19:20 +00:00
John Reck
58fb00025d am ecd3c76f: am 6458d9b1: Merge "Fix for truncated sentence in "Find on Page" field" 
* commit 'ecd3c76f6275d0ffb0b36100936cf284ab00bee2':
  Fix for truncated sentence in "Find on Page" field
 2013-01-22 13:57:51 -08:00
John Reck
ecd3c76f62 am 6458d9b1: Merge "Fix for truncated sentence in "Find on Page" field" 
* commit '6458d9b1b283590b5ced3c8982c4ea2e2a39cf2e':
  Fix for truncated sentence in "Find on Page" field
 2013-01-22 13:54:50 -08:00
John Reck
6458d9b1b2 Merge "Fix for truncated sentence in "Find on Page" field" 2013-01-22 21:12:49 +00:00
Dake Gu
85a06152ce am fe88f1be: Merge "Fix bug of SimulatedTrackball" into jb-mr1-aah-dev 
* commit 'fe88f1be3d197987a874f6c29fefdeb11db183f6':
  Fix bug of SimulatedTrackball
 2013-01-18 13:26:02 -08:00
Dake Gu
fe88f1be3d Merge "Fix bug of SimulatedTrackball" into jb-mr1-aah-dev 2013-01-18 21:22:45 +00:00
Alex Klyubin
4ef6c9b6a1 Add TLS Channel ID support to SSLCertificateSocketFactory. 
This adds a new method setChannelIdPrivateKey as a hidden API.

See http://tools.ietf.org/html/draft-balfanz-tls-channelid-00 for
more information about the TLS Channel ID extension.

Change-Id: I73c1905afdce01d4831de7faa55ea4496575b5a5
 2013-01-18 12:50:39 -08:00
Victoria Lease
00ef2a3622 am c62eefa0: am 3599f0a0: (-s ours) am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev 
* commit 'c62eefa02aefb0bf3870e063aa47df6dccbf5862':
  DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
 2013-01-18 10:53:48 -08:00
Victoria Lease
c62eefa02a am 3599f0a0: (-s ours) am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev 
* commit '3599f0a02129c238177806ce3d6db20853230d4d':
  DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
 2013-01-18 10:51:25 -08:00
Victoria Lease
3599f0a021 am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev 
* commit '0cf97d32178b689184866e731c0a4105d8223d80':
  DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
 2013-01-18 10:49:07 -08:00
Victoria Lease
0cf97d3217 Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care." into jb-mr1.1-dev 2013-01-18 18:43:11 +00:00
Robert Ly
dbdf8767e2 am 5287cd74: am 6d59e0ea: am a239b933: am 548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 
* commit '5287cd7476e0096f5f36866f81b47950343e4155':
  docs: Add PageTransformer to animations training class
 2013-01-18 10:34:11 -08:00
Robert Ly
5287cd7476 am 6d59e0ea: am a239b933: am 548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 
* commit '6d59e0ead242978eff8a64d314a1f8554694d8a6':
  docs: Add PageTransformer to animations training class
 2013-01-18 10:31:48 -08:00
Robert Ly
6d59e0ead2 am a239b933: am 548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 
* commit 'a239b933f7982ed069ccd284b4eab0fb5e4b6505':
  docs: Add PageTransformer to animations training class
 2013-01-18 10:28:41 -08:00
Robert Ly
a239b933f7 am 548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 
* commit '548e17dfdbd862cdfc663268a6d67b47f42b9544':
  docs: Add PageTransformer to animations training class
 2013-01-18 10:23:29 -08:00
Robert Ly
548e17dfdb Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 2013-01-18 18:20:40 +00:00
Dake Gu
f8739b992f Fix bug of SimulatedTrackball 
Simulated trackball should not generate KeyEvent if dispatchGenericMotionEvent
returns true

b/8022205

Change-Id: I1857e25407c508c98ef4db85fe146b1e25a0803e
 2013-01-17 18:15:44 -08:00
Roman Nurik
fb80c9e0f8 docs: Add PageTransformer to animations training class 
Change-Id: I01f7e5b1fa078d9219edf190e5e8444192cc55f1
 2013-01-17 15:37:20 -08:00
Andy McFadden
ac5b404053 am 7155becc: am ba92f666: am ee3a1d5e: am 9b6687bb: Fix code snippet 
* commit '7155becc05d99fb5ec52734cdef5605ae4a229e1':
  Fix code snippet
 2013-01-17 12:18:43 -08:00
Andy McFadden
7155becc05 am ba92f666: am ee3a1d5e: am 9b6687bb: Fix code snippet 
* commit 'ba92f6666db5ff5614df348bce5c9081b1495955':
  Fix code snippet
 2013-01-17 12:14:24 -08:00
Andy McFadden
ba92f6666d am ee3a1d5e: am 9b6687bb: Fix code snippet 
* commit 'ee3a1d5ecefe3d67df40c53de892b56ddf71bc81':
  Fix code snippet
 2013-01-17 12:11:47 -08:00
Andy McFadden
ee3a1d5ece am 9b6687bb: Fix code snippet 
* commit '9b6687bbc6a3e2866fdfd8ac3c725138d4c7ecbf':
  Fix code snippet
 2013-01-17 12:09:40 -08:00
Dirk Dougherty
dae2ac6f22 am d275891a: am ce15192c: am 4a0f95cf: am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 
* commit 'd275891a8aceab307746befcc0be08f4a73e99c2':
  Doc change: Fix urls to work properly with https.
 2013-01-17 11:59:18 -08:00
Dirk Dougherty
d275891a8a am ce15192c: am 4a0f95cf: am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 
* commit 'ce15192c72a3491f632d8cee89f2f58da1e4e0b6':
  Doc change: Fix urls to work properly with https.
 2013-01-17 11:55:49 -08:00
Andy McFadden
9b6687bbc6 Fix code snippet 
One of the examples was incorrect (both here and in the original).

http://b.android.com/42776

Change-Id: I2a218b724f50caf47d5185ef529ae8ab3104794f
 2013-01-17 11:24:02 -08:00
Elliott Hughes
8c27d0b309 am 686fad5e: am b1e16f11: Merge "Track a typo fix in hidden libcore API." 
* commit '686fad5e2367fe08afe6e219d460be994127fb5e':
  Track a typo fix in hidden libcore API.
 2013-01-17 10:32:00 -08:00
Elliott Hughes
686fad5e23 am b1e16f11: Merge "Track a typo fix in hidden libcore API." 
* commit 'b1e16f11ffd3a391be1a44a352c122b6dad1e8a5':
  Track a typo fix in hidden libcore API.
 2013-01-17 10:28:43 -08:00
Elliott Hughes
b1e16f11ff Merge "Track a typo fix in hidden libcore API." 2013-01-17 18:19:49 +00:00
Elliott Hughes
26df61683a Track a typo fix in hidden libcore API. 
Change-Id: I6fa3c2ef7f4d73bbf6557560e46c7c11bff74a32
 2013-01-17 09:24:47 -08:00
Elliott Hughes
2d40f625c4 Merge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp 2013-01-17 17:02:50 +00:00
Victoria Lease
79d59f0968 DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care. 
Change-Id: If87be5769b55368edaf4776189e8f6e51a21eb03

Conflicts:

	services/java/com/android/server/ServiceWatcher.java
 2013-01-16 17:37:21 -08:00
Sungmin Choi
05a96d11dd fix typo for symbol 
remove duplicated symbol (sliding_layout)

Change-Id: I401de3832328731d554dd4cda991b77b99454579
 2013-01-17 10:25:40 +09:00
Dirk Dougherty
ce15192c72 am 4a0f95cf: am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 
* commit '4a0f95cffbb9925e95c216aea41f3450885d4061':
  Doc change: Fix urls to work properly with https.
 2013-01-16 16:39:17 -08:00
Dirk Dougherty
4a0f95cffb am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 
* commit '3987f6c1793bd44305c491e9b57134a1df285599':
  Doc change: Fix urls to work properly with https.
 2013-01-16 16:37:03 -08:00
Dirk Dougherty
3987f6c179 Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 2013-01-17 00:30:09 +00:00
Justin Koh
73d94a30a2 am ba1992f8: Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'ba1992f8e9e50ca58f007ff528d2f6d2c2b18223':
  Remove doSingleCrunch call DO NOT MERGE
 2013-01-16 16:21:28 -08:00
Justin Koh
ba1992f8e9 Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev 2013-01-17 00:11:44 +00:00
Justin Koh
3944abbb50 Remove doSingleCrunch call DO NOT MERGE 
Remove doSingleCrunch call as it's breaking jb-mr1-aah-dev.

Change-Id: I0d8ee55344792fd868e74e07f31641a85e71168a
 2013-01-16 14:51:29 -08:00
Elliott Hughes
e9818ee8df DO NOT MERGE Fix build. 
Looks like a method that won't compile was left behind as part of
a merge conflict resolution.

Change-Id: I75eabc0c626a619a666642c7c685e4ce544095e7
 2013-01-16 11:26:35 -08:00
Scott Kennedy
2fd47fea32 am b61121d2: am ee6f89ff: am 3332aa98: am d7ec742c: docs: Minor typos 
* commit 'b61121d2a162493e97530fc7a6cbfce47c014b00':
  docs: Minor typos
 2013-01-16 10:15:54 -08:00
Scott Main
465ef7f2a2 am 6f8fe8dd: am 841c3491: am ceddf9f8: am 3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev 
* commit '6f8fe8dd4af55fb45ba9002cb0c36c8818a0b030':
  docs: put new devbytes playlist on the develop landing
 2013-01-16 10:15:51 -08:00
Scott Main
5c7c1468f7 am 29502977: am de902da2: docs: put new devbytes playlist on the develop landing 
* commit '29502977fc4b4e05868775b9153714d4d6d050c1':
  docs: put new devbytes playlist on the develop landing
 2013-01-16 10:15:47 -08:00
Scott Kennedy
b61121d2a1 am ee6f89ff: am 3332aa98: am d7ec742c: docs: Minor typos 
* commit 'ee6f89ff9cf08f78af84428102b910dd1275ef2d':
  docs: Minor typos
 2013-01-16 10:13:02 -08:00
Scott Main
6f8fe8dd4a am 841c3491: am ceddf9f8: am 3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev 
* commit '841c3491143e4946586caa7fe7cd4691d044ce62':
  docs: put new devbytes playlist on the develop landing
 2013-01-16 10:12:59 -08:00
Scott Main
29502977fc am de902da2: docs: put new devbytes playlist on the develop landing 
* commit 'de902da2c1f9e133de69267b5dbb122bce15adbc':
  docs: put new devbytes playlist on the develop landing
 2013-01-16 10:12:56 -08:00
Scott Kennedy
ee6f89ff9c am 3332aa98: am d7ec742c: docs: Minor typos 
* commit '3332aa985280d7e84c7cb70c33610efdd24873d7':
  docs: Minor typos
 2013-01-16 10:09:46 -08:00
Scott Main
841c349114 am ceddf9f8: am 3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev 
* commit 'ceddf9f8e824573d7e6be4b21edf0ffb89c7c929':
  docs: put new devbytes playlist on the develop landing
 2013-01-16 10:09:46 -08:00