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

103255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kmccormick
205d380bdc am 9da4bde4: am 4b846e0d: am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs 
* commit '9da4bde42329fe6c03d2eb4617f91892002e4460':
  Doc update: add links to maps docs
 2013-04-03 14:59:12 -07:00
kmccormick
9da4bde423 am 4b846e0d: am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs 
* commit '4b846e0d8192067dd7dbe371c5e1e49cd9e3d80f':
  Doc update: add links to maps docs
 2013-04-03 14:54:32 -07:00
Andre Eisenbach
6f0ed128e4 Fix minor LE descriptor permissions issue 
Change-Id: Idded482a08f17a1373adf3e3a51709ff585d4f24
 2013-04-03 14:54:12 -07:00
kmccormick
4b846e0d81 am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs 
* commit '322ba0d403ca063c1374d48c5a6717a585052abf':
  Doc update: add links to maps docs
 2013-04-03 14:50:32 -07:00
kmccormick
322ba0d403 am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs 
* commit 'a0907a1278c7ce568baabb3a4b1e2e9f83e18a09':
  Doc update: add links to maps docs
 2013-04-03 14:47:14 -07:00
Jean-Baptiste Queru
1c4c864a0b Update list of all audio files. 
This adds a script that can generate the list from the other
makefiles.

This also regenerates the list.

Bug: 6336895
Change-Id: If1546c4a3f5b1f0d7c3ca79d29383e9843b2a89d
 2013-04-03 14:47:14 -07:00
kmccormick
a0907a1278 am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs 
* commit 'edbe6e134846d2a01378497dca42b47be7e7292b':
  Doc update: add links to maps docs
 2013-04-03 14:43:37 -07:00
Jeff Brown
4d656885ed Clear mCurSender when mCurChannel is modified. 
This fixed an issue where an InputEventSender might outlive
its usefulness and continue to be used well after it should
have been disposed or recreated.

Also improves the queue management somewhat.

Bug: 8493879
Change-Id: I7e0b6a3c43cbe72f8762991f5d36560feebd214b
 2013-04-03 14:40:57 -07:00
kmccormick
edbe6e1348 Merge "Doc update: add links to maps docs" into jb-mr1.1-docs 2013-04-03 21:39:43 +00:00
kmccormick
b85e328d38 am bbcf0852: am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs 
* commit 'bbcf0852f786ea1c9cf6dca85f45487b7739bfab':
  Doc update: fix broken code sample
 2013-04-03 14:34:07 -07:00
kmccormick
d056e62b19 Doc update: add links to maps docs 
"Bug: 8090710"

Change-Id: I76b0a099dc41fca09300ea6530ea1bcc5f553da4
 2013-04-03 14:30:31 -07:00
kmccormick
bbcf0852f7 am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs 
* commit '9d9365916def1a60d98cab7d59a4c98d9e7f6f42':
  Doc update: fix broken code sample
 2013-04-03 14:30:09 -07:00
kmccormick
9d9365916d am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs 
* commit 'f57266175dffe68c5709f432dd6983c314d164f4':
  Doc update: fix broken code sample
 2013-04-03 14:26:34 -07:00
kmccormick
f57266175d am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs 
* commit '2144eee3576e3fb382170f502e41f1aae572559a':
  Doc update: fix broken code sample
 2013-04-03 14:23:54 -07:00
kmccormick
2144eee357 am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs 
* commit '3fb5536d625a070be712aa817705b93b262e3f8c':
  Doc update: fix broken code sample
 2013-04-03 14:21:10 -07:00
kmccormick
3fb5536d62 am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs 
* commit '91e01a4d2ee09a1a6a226302cd6d524a1c96070f':
  Doc update: fix broken code sample
 2013-04-03 14:18:56 -07:00
kmccormick
91e01a4d2e Merge "Doc update: fix broken code sample" into jb-mr1.1-docs 2013-04-03 21:16:08 +00:00
Jean-Michel Trivi
ca762beea4 am 6a570204: Merge "RemoteControlClient receives playback position change requests" into jb-mr2-dev 
* commit '6a5702041f48f868863a0454d7df6cd64eab235d':
  RemoteControlClient receives playback position change requests
 2013-04-03 14:14:49 -07:00
kmccormick
e4ce502d77 Doc update: fix broken code sample 
"Bug: 8537853"

Change-Id: Ieedfd24c39725ce7c6975300b6471ab3ef5884ee
 2013-04-03 14:13:36 -07:00
Jean-Michel Trivi
6a5702041f Merge "RemoteControlClient receives playback position change requests" into jb-mr2-dev 2013-04-03 21:11:12 +00:00
Ying Wang
d472ad7427 Merge branch 'jb-mr2-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into jb-mr2-dev-plus-aosp 2013-04-03 14:07:02 -07:00
Brian Carlstrom
3c7df09d4d am 6fdcb168: Merge "Adjust the HttpResponseCache for OkHttp." 
* commit '6fdcb168a7a0a4f508063019ca4d2ec35458f892':
  Adjust the HttpResponseCache for OkHttp.
 2013-04-03 14:06:55 -07:00
kmccormick
f43de869ed am 4d88259f: am fa387c51: am 73c8a7a8: am 3789fa0f: am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 
* commit '4d88259f625266400cd6116973d1bc152ae83f26':
  Doc update: clean up ubiquitous typo "the the"
 2013-04-03 14:06:50 -07:00
kmccormick
4d88259f62 am fa387c51: am 73c8a7a8: am 3789fa0f: am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 
* commit 'fa387c518274b91d770fb1b7285d6a123321ef9b':
  Doc update: clean up ubiquitous typo "the the"
 2013-04-03 14:01:53 -07:00
kmccormick
fa387c5182 am 73c8a7a8: am 3789fa0f: am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 
* commit '73c8a7a8200aab208abacc42a6fcbce5d3dbc1b0':
  Doc update: clean up ubiquitous typo "the the"
 2013-04-03 13:54:16 -07:00
kmccormick
73c8a7a820 am 3789fa0f: am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 
* commit '3789fa0f6becc09055d454808fe617754b5ef1c7':
  Doc update: clean up ubiquitous typo "the the"
 2013-04-03 13:51:49 -07:00
Chris Craik
9668dddd6f am ff7ae2dc: Merge "Correct save/restore match up" into jb-mr2-dev 
* commit 'ff7ae2dccd3b8ba015963126d8a655b417d3fcd3':
  Correct save/restore match up
 2013-04-03 13:50:25 -07:00
Kenny Root
0afa8b3694 am 75827d4a: Merge "Add direct API to get ManifestDigest" into jb-mr2-dev 
* commit '75827d4a3155c190f455329a67c84ac8fbb9bda0':
  Add direct API to get ManifestDigest
 2013-04-03 13:50:22 -07:00
Chris Craik
2e24cbf802 am e0b39fc1: Merge "Account for hairlines in quick rejection logic" into jb-mr2-dev 
* commit 'e0b39fc18c10224c4e66f70aa472d8497b1b4621':
  Account for hairlines in quick rejection logic
 2013-04-03 13:50:19 -07:00
kmccormick
3789fa0f6b am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 
* commit '8acb7166b3cbf00e6972393bc929ef7cc54c7108':
  Doc update: clean up ubiquitous typo "the the"
 2013-04-03 13:49:33 -07:00
kmccormick
8acb7166b3 am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 
* commit '8b5e342b0e24b9bb546456209d9d27480fa233e8':
  Doc update: clean up ubiquitous typo "the the"
 2013-04-03 13:47:42 -07:00
Kenny Root
7c15eca06f am a7e4795b: Merge "Remove keystore entries when package removed" 
* commit 'a7e4795bb35986164294e6f7ef56e31c9de0c06d':
  Remove keystore entries when package removed
 2013-04-03 13:38:37 -07:00
Andreas Huber
9a1ff831b7 am c9a1ca3c: Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM" 
* commit 'c9a1ca3c1a9f8591b675b980c1e390be8d901b39':
  MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM
 2013-04-03 13:38:34 -07:00
Chris Craik
ff7ae2dccd Merge "Correct save/restore match up" into jb-mr2-dev 2013-04-03 20:31:49 +00:00
ztenghui
f7d3aae328 Update the documentiation for MediaMuxer::writeSampleData() 
Change-Id: I7a5591c7b14728c1833e6401dcd8f0272c4ee56c
 2013-04-03 13:31:41 -07:00
Kenny Root
75827d4a31 Merge "Add direct API to get ManifestDigest" into jb-mr2-dev 2013-04-03 20:27:43 +00:00
Brian Carlstrom
6fdcb168a7 Merge "Adjust the HttpResponseCache for OkHttp." 2013-04-03 20:17:25 +00:00
jwilson
dea64ad715 Adjust the HttpResponseCache for OkHttp. 
Change-Id: I2a80f3c3f30a3d15673d797fa3d1211286f75030
 2013-04-03 20:15:36 +00:00
Craig Mautner
8d1a32a413 Merge commit 'ddc16ef4387ca25c607348f6155771f17a049763' into bogus 2013-04-03 13:14:30 -07:00
Jeff Sharkey
0c1baf9dd6 Nuke heavy parts of notification before archiving. 
Bug: 8537938
Change-Id: I2e4eccc3bd6d57fe5cef340d9e67986d78d3be95
 2013-04-03 13:08:52 -07:00
kmccormick
8b5e342b0e Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 2013-04-03 20:07:53 +00:00
kmccormick
76dfc02135 Doc update: clean up ubiquitous typo "the the" 
"Bug: 8531405"

Change-Id: Ib2b96dd2c1ab0f4d8abe5a8052bf2ef33f03b8be
 2013-04-03 13:04:06 -07:00
Chris Craik
e0b39fc18c Merge "Account for hairlines in quick rejection logic" into jb-mr2-dev 2013-04-03 19:43:47 +00:00
Chris Craik
1ed30c907f Correct save/restore match up 
bug:8480642

With the additional save/restore around the operations in flush, the
stored restore batches weren't matching up to the correct saves.

Change-Id: I2f48f19009bd97289b6973283f43dc8d3e35affd
 2013-04-03 12:37:35 -07:00
Baligh Uddin
f523ee8ea6 am bc9da0f4: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'bc9da0f4b5584d52b966b445deb2c4f9d87dd070':
  Import translations. DO NOT MERGE
 2013-04-03 12:35:47 -07:00
Kenny Root
6812059b2d am d72317ab: Remove keystore entries when package removed 
* commit 'd72317abd79ddf95d48c8f35bf1070900ff55b5e':
  Remove keystore entries when package removed
 2013-04-03 12:35:43 -07:00
Baligh Uddin
bc9da0f4b5 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-03 19:28:17 +00:00
Jeff Tinker
54cfbd6dc2 Implement async event callout from drm plugin to Java app 
Change-Id: I451b7c6f766aafac39ce432a71ef5a03bffe29f1
 2013-04-03 12:01:59 -07:00
Jeff Sharkey
a14acd20b8 Warn when exposing file:// Uris beyond a process. 
Check for file:// Uris inside Intents, ClipData, Notifications and
RemoteViews when StrictMode option is enabled.

Also introduces Intent.prepareToLeaveProcess() to uniformly handle
Intents about to leave an app process.

Bug: 8529070
Change-Id: I8efb43877cbc5f21eb029fc6492b3ee1415059ef
 2013-04-03 11:45:44 -07:00
Kenny Root
d72317abd7 Remove keystore entries when package removed 
Add a hook into PackageManagerService so that when app IDs are
completely removed, we erase all entries from keystore for those UIDs
that have gone away.

(cherry picked from commit 95e3ee3971915b323e5c13dcfe3b12a4180850cd)

Bug: 3020069
Change-Id: I374258ccc103f8cb3e238f2bf0d1afda0659db94
 2013-04-03 11:32:52 -07:00