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

68795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
f183dda0ad am a2310712: am 9d36dcc0: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit 'a231071249f03f7b10e1991c9988476d2b15a9f7':
 2012-03-01 16:46:58 -08:00
Robert Ly
24ed1b2fb5 am b4afb9a8: am 8125b0b4: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit 'b4afb9a89e1a2131ac273f0452fa89b83090b05a':
  docs: fix bug 5878445
 2012-03-01 16:46:55 -08:00
The Android Open Source Project
80b29211fd am efa49439: am 4f306bec: Reconcile with ics-mr1-release 
* commit 'efa4943952f81a5cb5a5d410cc4b53ca665d7065':
 2012-03-01 16:46:44 -08:00
Teng-Hui Zhu
4a00ab2563 Make sure egl context is valid for the onTrimMemory call 
It turns out that terminateHardwareResources can call into destroySurface
to make the current context 0, like in Gmail.

bug:6079959
Change-Id: I07b2f3e91d6276b6c8e1b48f72bc87d28337fe2f
 2012-03-01 16:46:32 -08:00
Jeff Brown
0765d4483b Merge "Shouldn't catch Throwable in AsyncTask." 2012-03-01 16:43:41 -08:00
Jeff Brown
b1ec5ef460 Shouldn't catch Throwable in AsyncTask. 
Throwable includes classes of Error that really should be fatal.

Bug: 5945222
Change-Id: I602f958396048451f404dd2306cdf5e57172acf0
 2012-03-01 16:33:04 -08:00
Irfan Sheriff
209266e93f Merge "Fix WifiManager async API" 2012-03-01 16:26:52 -08:00
Adam Powell
c7e5a2fe30 Merge "Fix dividers for LinearLayout (TabWidget)" 2012-03-01 16:26:04 -08:00
Fabrice Di Meglio
ac5a3a1c12 Merge "Make layoutDirection API public" 2012-03-01 16:23:29 -08:00
Brian Carlstrom
fc46475f7f Merge "Remove obsolete KeyChain references to USE_CREDENTIALS (2 of 2)" 2012-03-01 16:22:13 -08:00
Fabrice Di Meglio
98aec1c7ef Make layoutDirection API public 
Change-Id: Ie125513e4ea72b33b42355dbc43f9b9b6d46d7eb
 2012-03-01 16:21:55 -08:00
Jim Miller
fbc46dc3c2 Fix 6028595: Fix reboot loop in AccountUnlock due to null callback 
This fixes a bug where the device would get into a reboot loop due to having
a null callback.  The problem was that a recent change caused the callback
to be used indirectly by the constructor before being set.

The solution is to pass the callback to the KeyguardViewBase constructor
which ensures it's ready by the time we call getCallback().

Change-Id: I2598fc5338be99977980e4dea41a096fb2a7ef7e
 2012-03-01 16:15:27 -08:00
Teng-Hui Zhu
b22d6c11ef Merge "Allow webview to delete GL resource in a valid EGL context" 2012-03-01 16:04:18 -08:00
The Android Open Source Project
2755e31546 am 956abc30: am f8e58c8b: Reconcile with ics-mr1-release 
* commit '956abc304f6e03f20f4342988cbba9ac1c27a03b':
 2012-03-01 15:51:34 -08:00
Andreas Huber
d9c3217eff Merge "Remove hacks that worked around issues in OMX components several releases back." 2012-03-01 15:46:19 -08:00
Teng-Hui Zhu
d962413872 Allow webview to delete GL resource in a valid EGL context 
bug:6079959

Change-Id: Idee1031b0bcc4aeb498a18eb01970a8ed7efd285
 2012-03-01 15:37:58 -08:00
Android Git Automerger
6b822aafd4 am 55fbbce4: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit '55fbbce495723a5b17f1b4684d0f9826c75caa97':
 2012-03-01 15:35:49 -08:00
Yu Shan Emily Lau
32620e4f6b am da0c4a3e: am d12347b2: am eb4f3256: Set the video encoding bit rate for the media recorder stress test. 
* commit 'da0c4a3ea653a866d6a8fe00bc52f27d0841874b':
 2012-03-01 15:35:47 -08:00
Yu Shan Emily Lau
8790b57588 am 353b61a8: am 0ddfe24a: am eb4f3256: Set the video encoding bit rate for the media recorder stress test. 
* commit '353b61a87d9eb0ee223bdda76c30a1364441d962':
  Set the video encoding bit rate for the media recorder stress test.
 2012-03-01 15:35:43 -08:00
Jean-Baptiste Queru
7edb9a9490 am f73222a3: am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources" 
* commit 'f73222a39e0fa294d9105fd7464943aed6e77cd7':
  DRM framwork bug fix: add an API to release resources
 2012-03-01 15:35:39 -08:00
Jean-Baptiste Queru
b08dee9d38 am f09c0c7f: am 93920d79: am a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device" 
* commit 'f09c0c7f31e72611d91b4ac91ce5a9f019b16083':
  Set width of spinner's dropdown to fit on device
 2012-03-01 15:35:37 -08:00
Jean-Baptiste Queru
ab38500d9c am dbc591e2: am c69d6134: am 6ae4fe94: am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()" 
* commit 'dbc591e27686486c732fca2f94fde645e3487b7a':
  Adds documentation for ContentResolver notifyChange()
 2012-03-01 15:35:33 -08:00
Jean-Baptiste Queru
a4c8511218 am 9de7793b: am 4f906362: am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5 
* commit '9de7793b425be89889412f3a86466d7b19055c3c':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
 2012-03-01 15:35:25 -08:00
Jean-Baptiste Queru
adbe671920 am 715c78b9: am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits" 
* commit '715c78b933f8dec04882ebb73acd61fdd42c6c64':
  stagefright aacenc: Safeguard against overwriting bits
 2012-03-01 15:35:23 -08:00
Eric Fischer
1f5fbc3f93 am 4917bc10: am d31da0a6: am fb393f8b: Mark configuration strings as not translatable. 
* commit '4917bc104da1725d7ba093713de3802dec1515e5':
 2012-03-01 15:32:24 -08:00
Eric Fischer
e6929b0538 am b145e363: (-s ours) am ba62da99: am fb393f8b: Mark configuration strings as not translatable. 
* commit 'b145e363ff4e00048cdc9035300a6db05aa0fbb5':
  Mark configuration strings as not translatable.
 2012-03-01 15:32:22 -08:00
Martijn Coenen
188cddb1d8 Hidden API for setting p2p NFC modes. 
Change-Id: I406bab36b441cf99b5b45f51701dbcbab588a9b0
 2012-03-01 15:23:01 -08:00
Andreas Huber
9154f2d902 Remove hacks that worked around issues in OMX components several releases back. 
Change-Id: I89bb3d0be4d2c1824de382aedfdd4f9bd2547dbc
 2012-03-01 15:17:47 -08:00
Brian Carlstrom
fcdccac490 Remove obsolete KeyChain references to USE_CREDENTIALS (2 of 2) 
Change-Id: Ic8a22ce3a9010b8378af044e611bf787e15f6227
 2012-03-01 15:14:14 -08:00
Jim Miller
62f24df57a Merge "Fix 5797764: fix crash on tablets" 2012-03-01 15:01:53 -08:00
Jim Miller
46f31c31ea Fix 5797764: fix crash on tablets 
This fixes a crash on tablets introduced by Change Ifad76fb2. It was caused
by calling nativeStartSurfaceFlingerAnimation() on devices that previously
didn't call it and apparently don't support some feature it uses.

Change-Id: Ia4c04e7e611f45cde0fbeb861aec3435d1719552
 2012-03-01 14:56:47 -08:00
John Grossman
720aa28279 Switch the way we configure for MediaPlayer retransmission. 
This is a cherry-pick of I6ab07d89b2eeb0650e634b8c3b7a0b36aba4e7dd
with merge conflicts addressed by hand and additional changes made in
response to code review feedback.

Move in the direction of a more publishable API for configuring a
media player for retransmission.  It used to be that we used a custom
invoke and a modified URL (prefixed with aahTX://).  There are many
issues with this technique and it was never meant to stand the test of
time.

This CL gets rid of all that.  A new (but currently hidden) method was
introduced to the java level MediaPlayer API, called
setRetransmitTarget(InetSocketAddress), which allows an app writer to
set the retransmit target.  For now, this method needs to be called
before a call to setDataSource (which is pretty unusual for the
MediaPlayer API) because this mid level code uses this as a cue to
instantiate an aahTX player instead of relying on the data source to
select a player.  When retranmit functionality becomes part of the
existing android player implemenation, this
set-retrans-before-set-data-source behavior can go away, along with
the aahTX player itself.

Change-Id: I3b46c5227bbf69acb2f3cc4f93cfccad9777be98
Signed-off-by: John Grossman <johngro@google.com>
 2012-03-01 14:41:35 -08:00
John Grossman
d630f593d7 LibAAH_RTP: Add support for AAC in MP4. 
Cherry picked from Ie8298eb9d253fc6ede448da87660a60d23170987 and
conflicts fixed by hand.

Change-Id: I6f0a59357ba1a3d57caf67d2eb0ade7486723e7b
Signed-off-by: John Grossman <johngro@google.com>
 2012-03-01 14:41:35 -08:00
Jim Miller
3f4b1c4d58 Merge "Fix 5797764: don't hold PowerManager lock when changing native brightness" 2012-03-01 14:30:21 -08:00
Steve Block
cab063cf38 Merge "Prevent a 'TODO' from appearing in the JavaDoc" 2012-03-01 14:21:25 -08:00
Robert Ly
37f9360a21 am 3c78e101: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '3c78e101ec3ad427bf0341e3134659346fa06cc0':
 2012-03-01 14:15:03 -08:00
Robert Ly
ca7d7541c4 am d70eaff4: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit 'd70eaff41ce4e033656eeebb5eb7153b49d2ac5a':
  fix bug 5942522
 2012-03-01 14:13:15 -08:00
Robert Ly
3c78e101ec am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '941ff38d05f1d870df224ac329d16ab2207b94a1':
  fix bug 5942522
 2012-03-01 14:11:05 -08:00
Robert Ly
d70eaff41c am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '941ff38d05f1d870df224ac329d16ab2207b94a1':
  fix bug 5942522
 2012-03-01 14:10:46 -08:00
Robert Ly
941ff38d05 Merge "fix bug 5942522" into ics-mr1 2012-03-01 14:08:40 -08:00
Irfan Sheriff
d3975a9177 Fix WifiManager async API 
Fix the current asynchronous API to use callback like the way
was done with p2p API.

In the process, fix the use of WPS

Change-Id: Ib6f8714cf51b3525b655948268804e7eaaf17587
 2012-03-01 13:57:23 -08:00
JP Abgrall
d0f4e09cba dumpstate: move some of the cheaper-to-collect info earlier. 
Some of the state gathering commands take time (ping,...).
They give the system a chance to reboot when things are going belly-up.
We now move some of the cheaper ones (dmesg, last_kmsg, /proc/*...)
earlier in the dump.

Change-Id: I9ffc50ef9105a63193072bc34922dc0bc2bfbd38
 2012-03-01 13:37:30 -08:00
Christopher Tate
5bb59daf42 Merge: Send UpdateLock broadcasts to manifest receivers 
So that e.g. the system update service doesn't need to run all the time.

Bug 5543442

Change-Id: I4cd38240e67851daa5542a2962953e5dbed15b86
 2012-03-01 13:00:30 -08:00
Robert Ly
a231071249 am 9d36dcc0: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit '9d36dcc0f29d7afc7656d9320dd3a5edfb980989':
 2012-03-01 12:48:42 -08:00
Robert Ly
b4afb9a89e am 8125b0b4: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit '8125b0b4343b7f480196ce73103ca00cdf64f9e5':
  docs: fix bug 5878445
 2012-03-01 12:47:44 -08:00
Robert Ly
8125b0b434 am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit 'dcc910ea6eb724fe7e0a415afcdf1a5aefc42f06':
  docs: fix bug 5878445
 2012-03-01 12:44:36 -08:00
Robert Ly
9d36dcc0f2 am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit 'dcc910ea6eb724fe7e0a415afcdf1a5aefc42f06':
  docs: fix bug 5878445
 2012-03-01 12:44:35 -08:00
Robert Ly
dcc910ea6e Merge "docs: fix bug 5878445" into ics-mr1 2012-03-01 12:42:24 -08:00
Andreas Huber
faf88b85e2 Merge "Instead of hardcoding OMX component names in our code, support" 2012-03-01 12:41:10 -08:00
Tsu Chiang Chuang
4b1afab106 extend timeout to allow for more time for the device to connect. 
Change-Id: If3929ca69a5025c7048d57276813c270229a76db
 2012-03-01 12:28:14 -08:00