ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
46,093 Commits 2 Branches 0 Tags 54 MiB
06b573e4f9
Commit Graph

46093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
06b573e4f9 Merge "add more tracing for buffer allocation" 2012-03-01 21:22:35 -08:00
Mathias Agopian
cba1a9ab12 Merge "add more ATRACE" 2012-03-01 21:22:25 -08:00
Mathias Agopian
841cde5554 add more ATRACE 
Change-Id: I6cc5759fb0a05427680488fd12ae797e77644f3d
 2012-03-01 20:16:39 -08:00
Craig Mautner
b52cc9c516 Merge "Separate animation steps into start, step and finish phases. Fixes bug 6089126." 2012-03-01 19:29:46 -08:00
Dianne Hackborn
f1cb384fad Merge "Whoops forgot this change." 2012-03-01 19:21:40 -08:00
Dianne Hackborn
9d2521957d Merge "Fix issue where pm would clear preferred apps when updating an app." 2012-03-01 19:21:22 -08:00
Jim Miller
0d080ecdb9 Merge "Fix 6028595: Fix reboot loop in AccountUnlock due to null callback" 2012-03-01 19:02:19 -08:00
Fabrice Di Meglio
7486a1162e Merge "Improve RTL APIs" 2012-03-01 17:44:19 -08:00
Romain Guy
489380f470 Merge "Remove stray log" 2012-03-01 17:35:25 -08:00
Tsu Chiang Chuang
00c8249524 am 8f0c03b7: am 673a66e3: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '8f0c03b7833c719c29198be0e4fecbdfb4013e64':
 2012-03-01 17:15:32 -08:00
Tsu Chiang Chuang
2beecf150d am 6053b195: am bb69bde5: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '6053b195bcd49676b46b2257f6e1da04d0b4d9a5':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:12:55 -08:00
Tsu Chiang Chuang
4eb0a7423b am 673a66e3: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '673a66e357f49f939cf8e7f603ff14b8474c9032':
 2012-03-01 17:11:22 -08:00
Tsu Chiang Chuang
9b070feff2 am bb69bde5: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit 'bb69bde593bc0ba58c744b19c43619d4eb0866b7':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:10:23 -08:00
Tsu Chiang Chuang
0f88bfc2d8 am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '3e70127021f5d5940edfdefd7e33fd65d4ec0449':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:07:43 -08:00
Tsu Chiang Chuang
d3cb1c2f89 am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '3e70127021f5d5940edfdefd7e33fd65d4ec0449':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:07:25 -08:00
Tsu Chiang Chuang
b1b58c7e01 Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 2012-03-01 17:05:43 -08:00
Wink Saville
011d5e216b Merge "Telephony: Remove SimCard and RuimCard" 2012-03-01 17:03:47 -08:00
Robert Ly
c1c13af09a am 37f9360a: am 3c78e101: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '37f9360a21985b2627d7069160d2950edf31c021':
 2012-03-01 16:47:06 -08:00
Robert Ly
3d5474e8db am ca7d7541: am d70eaff4: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit 'ca7d7541c4cad188eb643113e3c3e91e63d21a5e':
  fix bug 5942522
 2012-03-01 16:47:04 -08:00
Robert Ly
e9658e26f0 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
1928ae8c7a 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
1b25fd9ea2 am efa49439: am 4f306bec: Reconcile with ics-mr1-release 
* commit 'efa4943952f81a5cb5a5d410cc4b53ca665d7065':
 2012-03-01 16:46:44 -08:00
Jeff Brown
cf274215e1 Merge "Shouldn't catch Throwable in AsyncTask." 2012-03-01 16:43:41 -08:00
Irfan Sheriff
ee48a84775 Merge "Fix WifiManager async API" 2012-03-01 16:26:52 -08:00
Fabrice Di Meglio
e23b4521ee Merge "Make layoutDirection API public" 2012-03-01 16:23:29 -08:00
Brian Carlstrom
9011600b21 Merge "Remove obsolete KeyChain references to USE_CREDENTIALS (2 of 2)" 2012-03-01 16:22:13 -08:00
Teng-Hui Zhu
715f6e8a65 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
4d811ec616 am 956abc30: am f8e58c8b: Reconcile with ics-mr1-release 
* commit '956abc304f6e03f20f4342988cbba9ac1c27a03b':
 2012-03-01 15:51:34 -08:00
Andreas Huber
66b4557b7e Merge "Remove hacks that worked around issues in OMX components several releases back." 2012-03-01 15:46:19 -08:00
Android Git Automerger
0921733b1a 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
2013c379ab 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
5d2ae34573 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
c8a2180afa 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
24d4e44579 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
88498d60fd 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
c41fbc3ccf 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
d90b9b8164 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
16782f6625 am 4917bc10: am d31da0a6: am fb393f8b: Mark configuration strings as not translatable. 
* commit '4917bc104da1725d7ba093713de3802dec1515e5':
 2012-03-01 15:32:24 -08:00
Eric Fischer
4d608d7525 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
Jim Miller
d712843b84 Merge "Fix 5797764: fix crash on tablets" 2012-03-01 15:01:53 -08:00
Jim Miller
8a5da14425 Merge "Fix 5797764: don't hold PowerManager lock when changing native brightness" 2012-03-01 14:30:21 -08:00
Steve Block
768f8c4320 Merge "Prevent a 'TODO' from appearing in the JavaDoc" 2012-03-01 14:21:25 -08:00
Robert Ly
a278f4642a am 3c78e101: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '3c78e101ec3ad427bf0341e3134659346fa06cc0':
 2012-03-01 14:15:03 -08:00
Robert Ly
ffb9866bd3 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
b11d85180c am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '941ff38d05f1d870df224ac329d16ab2207b94a1':
  fix bug 5942522
 2012-03-01 14:11:05 -08:00
Robert Ly
2723562129 am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '941ff38d05f1d870df224ac329d16ab2207b94a1':
  fix bug 5942522
 2012-03-01 14:10:46 -08:00
Robert Ly
55383fdaa7 Merge "fix bug 5942522" into ics-mr1 2012-03-01 14:08:40 -08:00
Robert Ly
47af9e48dc am 9d36dcc0: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit '9d36dcc0f29d7afc7656d9320dd3a5edfb980989':
 2012-03-01 12:48:42 -08:00
Robert Ly
2b53ed68c6 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
88e35b82c0 am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit 'dcc910ea6eb724fe7e0a415afcdf1a5aefc42f06':
  docs: fix bug 5878445
 2012-03-01 12:44:36 -08:00