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

84050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
c209a06cfd Let apps provide a custom data source for extractors 
Adds android.media.DataSource, which is modeled after its native namesake,
and a new method on MediaExtractor that lets apps specify their implementation
of a DataSource as the source of data for the extractor.

Change-Id: If1b169bd18d2691ebc4f8996494dfc8ee0894b6c
 2012-08-24 10:36:51 -07:00
Chris Wren
ccc1cabd42 [phones] Only allow double-flick opening of the quicksettings panel. 
Bug: 7043587
Change-Id: I39d208626c477e8c081c9d81c3124eb631152998
 2012-08-24 10:33:51 -07:00
Chris Wren
27e849c688 am e370c468: Merge "[phones] Only allow double-flick opening of the quicksettings panel." into jb-mr1-dev 
* commit 'e370c468221bfef8f73c20f9d013cd22f06e2da7':
  [phones] Only allow double-flick opening of the quicksettings panel.
 2012-08-24 09:27:01 -07:00
Chris Wren
e370c46822 Merge "[phones] Only allow double-flick opening of the quicksettings panel." into jb-mr1-dev 2012-08-24 09:24:10 -07:00
Chris Wren
b8ea2f59e2 [phones] Only allow double-flick opening of the quicksettings panel. 
Bug: 7043587
Change-Id: I39d208626c477e8c081c9d81c3124eb631152998
 2012-08-24 12:20:30 -04:00
Victoria Lease
73eebac05d am 54f4f91d: Merge "avert 2500ms wait in InputMethodManager" into jb-mr1-dev 
* commit '54f4f91d7c519df0a913528d05ac26372fb2d7e2':
  avert 2500ms wait in InputMethodManager
 2012-08-24 08:04:03 -07:00
Victoria Lease
54f4f91d7c Merge "avert 2500ms wait in InputMethodManager" into jb-mr1-dev 2012-08-24 08:01:41 -07:00
Wink Saville
da88ba4737 am 78e73224: am 4e9c7e3f: am 5a60f058: am 13ab2c9f: Merge "Telephony: Add ICC_UNKNOWN intent" 
* commit '78e73224cad050bb78061dac6123da79fc303dcf':
  Telephony: Add ICC_UNKNOWN intent
 2012-08-24 07:34:28 -07:00
Dianne Hackborn
feb7a7222c am d820c38d: am 513f68bc: am bfe20d1a: am 8bfba7df: Merge "fix wrong substring" 
* commit 'd820c38d21c4c6f931785945a36cc82269f63694':
  fix wrong substring
 2012-08-24 07:34:25 -07:00
Jean-Baptiste Queru
8fe1b09dc2 am 58dc9b6b: am 790d3403: am d86bebb4: am 322b0a16: Merge "Protecting more views from (bad) MotionEvents" 
* commit '58dc9b6bfa55d22ce145591ceab6bccd0f2b441f':
  Protecting more views from (bad) MotionEvents
 2012-08-24 07:34:22 -07:00
Irfan Sheriff
e1ab31055d am 058f0035: am 2a4aaf13: Merge "resolved conflicts for merge of 86bb2258 to jb-dev-plus-aosp" into jb-dev-plus-aosp 
* commit '058f00350766a19b06bfdc72850985c3eca71c5f':
  Fix system server restart
 2012-08-24 07:34:18 -07:00
Wink Saville
78e73224ca am 4e9c7e3f: am 5a60f058: am 13ab2c9f: Merge "Telephony: Add ICC_UNKNOWN intent" 
* commit '4e9c7e3f60cee01b5bf376d53938b07c97f35a9e':
  Telephony: Add ICC_UNKNOWN intent
 2012-08-24 07:30:15 -07:00
Dianne Hackborn
d820c38d21 am 513f68bc: am bfe20d1a: am 8bfba7df: Merge "fix wrong substring" 
* commit '513f68bc5a5f15d799f8795392d4861a5704fba1':
  fix wrong substring
 2012-08-24 07:30:11 -07:00
Jean-Baptiste Queru
58dc9b6bfa am 790d3403: am d86bebb4: am 322b0a16: Merge "Protecting more views from (bad) MotionEvents" 
* commit '790d34039df650d983c7c87a2a2e888e18edc2be':
  Protecting more views from (bad) MotionEvents
 2012-08-24 07:30:06 -07:00
Irfan Sheriff
058f003507 am 2a4aaf13: Merge "resolved conflicts for merge of 86bb2258 to jb-dev-plus-aosp" into jb-dev-plus-aosp 
* commit '2a4aaf133c8bec9bbfcd50c1eb0f25896f579cd1':
  Fix system server restart
 2012-08-24 07:29:52 -07:00
Jean-Baptiste Queru
cbf9658f70 am 07bde72f: resolved conflicts for merge of 9455f8f2 to jb-mr1-dev 
* commit '07bde72ff9209de9c037d9bba36bdf0cba299aab':
  WifiStateMachine: ignore auth-fail event during WPS connection
 2012-08-24 07:28:40 -07:00
Jean-Baptiste Queru
07bde72ff9 resolved conflicts for merge of 9455f8f2 to jb-mr1-dev 
Change-Id: I6c6970adb58ac45473c7cc665d99f8e8a6ca8571
 2012-08-24 07:21:07 -07:00
Ben Murdoch
42f78d0364 am 4d3a7b07: Merge "Make SslErrorHandler ctor public/@hide." into jb-mr1-dev 
* commit '4d3a7b075298d1379e9d6ba84bc02a347344a001':
  Make SslErrorHandler ctor public/@hide.
 2012-08-24 02:13:17 -07:00
Ben Murdoch
4d3a7b0752 Merge "Make SslErrorHandler ctor public/@hide." into jb-mr1-dev 2012-08-24 02:10:38 -07:00
Wu-cheng Li
248ca045fc am dad32938: Merge "Add INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE intent." into jb-mr1-dev 
* commit 'dad32938cd22c82ae54d0555d205f33c8462e3fb':
  Add INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE intent.
 2012-08-24 00:35:05 -07:00
Wu-cheng Li
dad32938cd Merge "Add INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE intent." into jb-mr1-dev 2012-08-24 00:07:32 -07:00
The Android Automerger
c56789731f merge in jb-mr0-release history after reset to jb-dev 2012-08-23 21:30:27 -07:00
Baligh Uddin
fc09065229 am 5d1a61ca: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '5d1a61ca1e8da78d22a4fe0ce5c84f788ab1d5f8':
  Import translations. DO NOT MERGE
 2012-08-23 19:33:56 -07:00
Baligh Uddin
5d1a61ca1e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-23 19:31:15 -07:00
Baligh Uddin
e7f30a7907 am 51fabf23: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '51fabf2319175dbecf60138cef3e5ed16d2001cf':
  Import translations. DO NOT MERGE
 2012-08-23 19:14:26 -07:00
Baligh Uddin
51fabf2319 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-23 19:11:34 -07:00
Baligh Uddin
3081c71a83 Import translations. DO NOT MERGE 
Change-Id: Ie2c09a688d76f2886909461362de765820d3e255
Auto-generated-cl: translation import
 2012-08-23 17:24:01 -07:00
Baligh Uddin
4e2055b75b Import translations. DO NOT MERGE 
Change-Id: I08748f05d8e19beabd73ff7d895e8a15e2952aed
Auto-generated-cl: translation import
 2012-08-23 17:09:40 -07:00
Irfan Sheriff
35bbe27d58 Fix permission issue on channel 
Change-Id: I57f5d128dc2e2aa3bff93e82456f73cb96851f82
 2012-08-23 16:57:43 -07:00
Craig Mautner
f4516a8581 am fc6baa83: Merge "Fix unprotected variable access by serializing." into jb-mr1-dev 
* commit 'fc6baa834913ec04ed14979341b994f790a53256':
  Fix unprotected variable access by serializing.
 2012-08-23 16:49:51 -07:00
Jeff Sharkey
45a630e87e am d5fc86f0: Merge "Begin moving VPN to NetworkStateTracker pattern." into jb-mr1-dev 
* commit 'd5fc86f0677575333556fe579838353fae10ce52':
  Begin moving VPN to NetworkStateTracker pattern.
 2012-08-23 16:49:47 -07:00
Craig Mautner
fc6baa8349 Merge "Fix unprotected variable access by serializing." into jb-mr1-dev 2012-08-23 16:47:50 -07:00
Jeff Sharkey
d5fc86f067 Merge "Begin moving VPN to NetworkStateTracker pattern." into jb-mr1-dev 2012-08-23 16:47:50 -07:00
rich cannings
5e4e1251f6 am e7485cbc: MAXIMUM_VERIFICATION_TIMEOUT incorrect 
* commit 'e7485cbc45545e5e20e003790468cd2bcd965979':
  MAXIMUM_VERIFICATION_TIMEOUT incorrect
 2012-08-23 16:46:09 -07:00
Jeff Sharkey
899223b97c Begin moving VPN to NetworkStateTracker pattern. 
Created base tracker that handles common bookkeeping, and move VPN
to become a tracker.  VPN status is now reflected in NetworkInfo, and
is mapped to LegacyVpnInfo.

Legacy VPN now "babysits" any init services it starts, watching for
when they stop unexpectedly.

Bug: 5756357
Change-Id: Iba7ec79da69469f6bd9a970cc39cf6b885b4c9c4
 2012-08-23 16:41:06 -07:00
rich cannings
e7485cbc45 MAXIMUM_VERIFICATION_TIMEOUT incorrect 
Missed a 0.

Change-Id: Ia27d97520ef74cde529fb57ac05e6a37122cd3c2
 2012-08-23 16:39:12 -07:00
Teng-Hui Zhu
f5d102ed76 Request Layout after video size changed 
bug:6800665

Change-Id: I57010ac26246dff9da45f8fdb7ccbe39c454c54f
 2012-08-23 16:03:22 -07:00
rich cannings
bf3f28583f am 7646c773: Merge "Allow verifiers to extend timeout" into jb-mr1-dev 
* commit '7646c773fab6a12b0727c5e25b8d17d6c5263f8e':
  Allow verifiers to extend timeout
 2012-08-23 15:59:04 -07:00
Jean-Baptiste Queru
728cf13bed am f1d9f892: am 79f6c5f5: am 1e739c96: am a4e34ae8: Merge "Properly handle quick switch between Home button and Gallery app" 
* commit 'f1d9f892f1dda5b277c58f91a5ceaa35196d6423':
  Properly handle quick switch between Home button and Gallery app
 2012-08-23 15:56:58 -07:00
rich cannings
7646c773fa Merge "Allow verifiers to extend timeout" into jb-mr1-dev 2012-08-23 15:56:04 -07:00
Jean-Baptiste Queru
f1d9f892f1 am 79f6c5f5: am 1e739c96: am a4e34ae8: Merge "Properly handle quick switch between Home button and Gallery app" 
* commit '79f6c5f5673c76c359f9f4b38539cfdb0251efee':
  Properly handle quick switch between Home button and Gallery app
 2012-08-23 15:54:05 -07:00
Katie McCormick
2f5125a33b am 67de61b0: Merge "resolved conflicts for merge of 9447af12 to jb-mr1-dev" into jb-mr1-dev 
* commit '67de61b06038bf5f4b23a76f9da800f4fd65e827':
  Doc update: client javadoc fix for @value.
 2012-08-23 15:53:51 -07:00
Katie McCormick
67de61b060 Merge "resolved conflicts for merge of 9447af12 to jb-mr1-dev" into jb-mr1-dev 2012-08-23 15:50:29 -07:00
rich cannings
d9ef3e5495 Allow verifiers to extend timeout 
Create a new verifier API to extend the timeout for a giving package,
including the resulting action (allow or deny) upon the timeout occuring.

Bug: 6901038
Change-Id: I351f7944327f863aff1d7dd1227be74652fa1511
 2012-08-23 15:39:02 -07:00
Victoria Lease
b570c64ad1 avert 2500ms wait in InputMethodManager 
When dispatching input events to the main thread, the event is
handled directly rather than queued. If we have a timeout waiting for
the event to happen, it has to be registered before we call the
dispatcher, otherwise we'll wait for the timeout even though the event
has already been handled.

Bug: 6734044
Change-Id: I6826163dbc6133b385cf1076bb077fb4e82870a1
 2012-08-23 15:32:42 -07:00
Wink Saville
4e9c7e3f60 am 5a60f058: am 13ab2c9f: Merge "Telephony: Add ICC_UNKNOWN intent" 
* commit '5a60f058891fa5417df7d53be28521b604071fea':
  Telephony: Add ICC_UNKNOWN intent
 2012-08-23 15:12:31 -07:00
Dianne Hackborn
513f68bc5a am bfe20d1a: am 8bfba7df: Merge "fix wrong substring" 
* commit 'bfe20d1aa1b1236e6592914c5682c59d94936432':
  fix wrong substring
 2012-08-23 15:12:26 -07:00
Jean-Baptiste Queru
790d34039d am d86bebb4: am 322b0a16: Merge "Protecting more views from (bad) MotionEvents" 
* commit 'd86bebb4a9aaf3b98f6d5a189fd7733926d85891':
  Protecting more views from (bad) MotionEvents
 2012-08-23 15:12:21 -07:00
Wink Saville
5a60f05889 am 13ab2c9f: Merge "Telephony: Add ICC_UNKNOWN intent" 
* commit '13ab2c9fdaec119a40b628ae772fd1462fbb826d':
  Telephony: Add ICC_UNKNOWN intent
 2012-08-23 15:09:43 -07:00
Dianne Hackborn
bfe20d1aa1 am 8bfba7df: Merge "fix wrong substring" 
* commit '8bfba7df376509cc944b80bd1f1715f1ef94b246':
  fix wrong substring
 2012-08-23 15:09:39 -07:00