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

60352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
a0cd7ad6c6 am 54303e6b: am b20d378c: Merge "Don\'t crash during full backup when CheckJNI is enabled" into ics-factoryrom 
* commit '54303e6b2361e2fbfe889f4464074c89763f7ab1':
  Don't crash during full backup when CheckJNI is enabled
 2011-09-23 14:07:16 -07:00
Scott Main
2d31058424 am c86bc42c: Merge "docs: a few additions and revisions to action bar docs" 
* commit 'c86bc42cb1b910c1150c8f5aa74c1c160c1359e3':
  docs: a few additions and revisions to action bar docs
 2011-09-23 14:07:14 -07:00
Christopher Tate
54303e6b23 am b20d378c: Merge "Don\'t crash during full backup when CheckJNI is enabled" into ics-factoryrom 
* commit 'b20d378cec09da18301eb9c33bc88251beb81042':
  Don't crash during full backup when CheckJNI is enabled
 2011-09-23 13:21:07 -07:00
Christopher Tate
b20d378cec Merge "Don't crash during full backup when CheckJNI is enabled" into ics-factoryrom 2011-09-23 13:19:33 -07:00
Scott Main
c86bc42cb1 Merge "docs: a few additions and revisions to action bar docs" 2011-09-23 13:13:13 -07:00
Christopher Tate
ca1605e6e3 Don't crash during full backup when CheckJNI is enabled 
It's not okay to pass null to JNI methods and trust that it will just
back off and return a null result cleanly.  Fixes bug 5361822 .

Change-Id: Id8a17b958fd183d55cb6475f394e158c13aae2ea
 2011-09-23 13:12:49 -07:00
Dianne Hackborn
04d98fb638 am 67c5b125: Merge "Fix issue #5321282: Force Stop Button in Battery Screen Not disabled correctly" 
* commit '67c5b1251178532726964c2e0f4229d079ff0a3e':
  Fix issue #5321282: Force Stop Button in Battery Screen Not disabled correctly
 2011-09-23 12:58:33 -07:00
Dianne Hackborn
67c5b12511 Merge "Fix issue #5321282: Force Stop Button in Battery Screen Not disabled correctly" 2011-09-23 12:56:42 -07:00
Scott Main
e797ed6a74 docs: a few additions and revisions to action bar docs 
Change-Id: I12c24e5d4ed49d8f9822050d330f617bd614b7b9
 2011-09-23 12:56:20 -07:00
Kenny Root
e327fe4611 am 3f816086: Merge "Less verbose message when dexopt non-APK" 
* commit '3f8160868003eb2525e5a69ed6b0a1790a30cd1b':
  Less verbose message when dexopt non-APK
 2011-09-23 12:51:17 -07:00
Kenny Root
3f81608680 Merge "Less verbose message when dexopt non-APK" 2011-09-23 12:49:44 -07:00
Adam Powell
0cdb24da5b am 90d33ccd: Merge "Remove unnecessary parameter" 
* commit '90d33ccd16cf909ac4920a593772204d7bcf45db':
  Remove unnecessary parameter
 2011-09-23 12:47:03 -07:00
Adam Powell
90d33ccd16 Merge "Remove unnecessary parameter" 2011-09-23 12:45:13 -07:00
Andreas Huber
6677ea6161 am 7fa3b435: Merge "Add an option to dump the raw stream to a file in the stagefright cmdline tool." 
* commit '7fa3b435d67e3ba2c879431f44e262c40716ebd8':
  Add an option to dump the raw stream to a file in the stagefright cmdline tool.
 2011-09-23 11:36:49 -07:00
David Brown
812a837bc5 am e45beeb7: Merge "Temp fix to the problem of incorrectly classifying Brazilian local numbers as emergency numbers." 
* commit 'e45beeb7493070f3a2b9ff90f42009288e1372b2':
  Temp fix to the problem of incorrectly classifying Brazilian local numbers as emergency numbers.
 2011-09-23 11:36:47 -07:00
Adam Powell
4f4b7fbf3c am 5c267ece: Merge "Fix leaky view tags" 
* commit '5c267ecec6529a384e76a8b4a261b73aadaf1130':
  Fix leaky view tags
 2011-09-23 11:36:31 -07:00
Andreas Huber
7fa3b435d6 Merge "Add an option to dump the raw stream to a file in the stagefright cmdline tool." 2011-09-23 11:27:51 -07:00
David Brown
e45beeb749 Merge "Temp fix to the problem of incorrectly classifying Brazilian local numbers as emergency numbers." 2011-09-23 11:25:57 -07:00
Adam Powell
2b2f6d6c54 Remove unnecessary parameter 
Change-Id: I32810a31140263a996d4f600fa53db5f29e60f42
 2011-09-23 11:15:39 -07:00
Adam Powell
5c267ecec6 Merge "Fix leaky view tags" 2011-09-23 11:05:25 -07:00
Andreas Huber
a17545339b Add an option to dump the raw stream to a file in the stagefright cmdline tool. 
Change-Id: Ie19eca2cdf162d6973037ec554ef5916243ea7d7
 2011-09-23 10:25:32 -07:00
Kenny Root
fec5e75c96 Less verbose message when dexopt non-APK 
The message when something is not an APK that is submitted for dexopt is
not extremely helpful. Make it more precise and remove the useless
traceback.

Change-Id: Ibb34b2b2c10ee28ea98662c3f6fd070529cf8c4f
 2011-09-23 10:13:06 -07:00
Wei Huang
68d7e0d2ab am e448f557: am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom 
* commit 'e448f557f620ae30dcead7a4423059dfb7d70add':
  Update camera javadoc about AE and AWB lock.
 2011-09-23 10:07:33 -07:00
Wei Huang
e448f557f6 am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom 
* commit '3d9a9e55df85c720573e69ec3062efc331ea69bb':
  Update camera javadoc about AE and AWB lock.
 2011-09-23 10:05:22 -07:00
Wei Huang
3d9a9e55df Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom 2011-09-23 10:04:02 -07:00
Eric Fischer
55df8eac24 am ec26232d: am c4517842: Merge "Delete translations of files that no longer exist." into ics-factoryrom 
* commit 'ec26232d70a342aa88e8190818b1b2973b20186e':
  Delete translations of files that no longer exist.
 2011-09-23 09:47:38 -07:00
Eric Fischer
ec26232d70 am c4517842: Merge "Delete translations of files that no longer exist." into ics-factoryrom 
* commit 'c4517842ee2a641342f151ecafb797080b9ed84d':
  Delete translations of files that no longer exist.
 2011-09-23 09:45:50 -07:00
Eric Fischer
c4517842ee Merge "Delete translations of files that no longer exist." into ics-factoryrom 2011-09-23 09:43:55 -07:00
Daniel Sandler
a399b03d09 am a8c46b1d: Merge "Put the correct background behind largeIcons." 
* commit 'a8c46b1dc47f0fa92f41c6311ca6131d18efbcd4':
  Put the correct background behind largeIcons.
 2011-09-23 09:35:18 -07:00
Daniel Sandler
a8c46b1dc4 Merge "Put the correct background behind largeIcons." 2011-09-23 09:33:18 -07:00
Pannag Sanketi
f5e4892e5f am 91d34137: am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom 
* commit '91d34137903c278e5e077fa1edef9bbbcdd140f7':
  Returning EOS in SurfaceMediaSource:read
 2011-09-23 09:10:41 -07:00
Pannag Sanketi
91d3413790 am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom 
* commit '1d71c7b40a7f38487e602e78f45279b6a8364fc9':
  Returning EOS in SurfaceMediaSource:read
 2011-09-23 09:08:11 -07:00
Pannag Sanketi
1d71c7b40a Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom 2011-09-23 09:06:55 -07:00
Mike Lockwood
78b19b4307 Merge "Add SerialPort.sendBreak()" into ics-aah 2011-09-23 09:02:20 -07:00
Mike Lockwood
6010dafe06 Add SerialPort.sendBreak() 
Change-Id: If25ba7724cf69489f2b04fc995baa9c164b5ea58
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-09-23 11:43:42 -04:00
Wei Huang
0205a57284 am 4cd34752: am 5d87227b: Merge "Clear callbacks in camera stopPreview." into ics-factoryrom 
* commit '4cd34752cb229f3e1716e1e92f54f58dd847745c':
  Clear callbacks in camera stopPreview.
 2011-09-23 08:37:20 -07:00
Wei Huang
4cd34752cb am 5d87227b: Merge "Clear callbacks in camera stopPreview." into ics-factoryrom 
* commit '5d87227bad8126d701145cd07c3ac2a365e8480e':
  Clear callbacks in camera stopPreview.
 2011-09-23 08:33:46 -07:00
Wei Huang
5d87227bad Merge "Clear callbacks in camera stopPreview." into ics-factoryrom 2011-09-23 08:30:32 -07:00
Brandon Keely
de58b30891 am c56c9201: Merge "Make LockScreen ping() on a miss." 
* commit 'c56c92013c0acfa4517ed5d36d8aa78bc21452ae':
  Make LockScreen ping() on a miss.
 2011-09-23 07:47:57 -07:00
Brandon Keely
c56c92013c Merge "Make LockScreen ping() on a miss." 2011-09-23 07:46:30 -07:00
Justin Ho
0bd4e97881 am 092c339a: am a780fb8e: Merge "Updating ellipsis in Roboto Bug: 5344295" into ics-factoryrom 
* commit '092c339ae704a4be9ff14b88b2ae31e06166374f':
  Updating ellipsis in Roboto Bug: 5344295
 2011-09-23 07:32:42 -07:00
Justin Ho
092c339ae7 am a780fb8e: Merge "Updating ellipsis in Roboto Bug: 5344295" into ics-factoryrom 
* commit 'a780fb8e22d72b3f2c09b16eeddeff30e417ee3c':
  Updating ellipsis in Roboto Bug: 5344295
 2011-09-23 07:30:18 -07:00
Justin Ho
a780fb8e22 Merge "Updating ellipsis in Roboto Bug: 5344295" into ics-factoryrom 2011-09-23 07:28:31 -07:00
Justin Ho
16faafb493 Updating ellipsis in Roboto 
Bug: 5344295

Change-Id: Ia885ff39da0609f51863665125bae3a1024e161c
 2011-09-23 07:27:35 -07:00
Chih-yu Huang
664d72e663 Clear callbacks in camera stopPreview. 
Clear those callbacks to remove the references
so the memory can be recycled.

bug:5358774
Change-Id: I3b6034a1891126b3437a6744013f38a64f5bb03b
 2011-09-23 20:28:28 +08:00
Peter Ng
579506261b am b48ca1f1: am dd33bf0e: Merge "Fix 5355659: Minor tweak to wave ping radius in MultiWaveView." into ics-factoryrom 
* commit 'b48ca1f1ab8cf77db337d6f2bc8586cc172ab6f8':
  Fix 5355659: Minor tweak to wave ping radius in MultiWaveView.
 2011-09-22 23:44:51 -07:00
Robert Greenwalt
097e5f3710 am 511ecc8c: am b849074c: Merge "Tell the resolver what protocols to use." into ics-factoryrom 
* commit '511ecc8cf9f1b0660c4284f667cbc3807d2ebf82':
  Tell the resolver what protocols to use.
 2011-09-22 23:44:49 -07:00
Justin Ho
88b65d4995 am 006dc043: am 4dfe8695: Merge "CAB assets" into ics-factoryrom 
* commit '006dc043f0df929140ed71a28f4c401fa2e3bcd3':
  CAB assets
 2011-09-22 23:44:47 -07:00
Justin Ho
46845fb436 am 64edbc30: am 777163e0: Merge "Updated emergency icon on lockscreen" into ics-factoryrom 
* commit '64edbc30938cea722dfe3038c9db069f1c480acf':
  Updated emergency icon on lockscreen
 2011-09-22 23:44:45 -07:00
John Wang
85248df45e am 5298a8c7: am dd6d1bbd: Merge "Update PUK unlock screen." into ics-factoryrom 
* commit '5298a8c71ae0125b32cc9e00062b9be370d9a043':
  Update PUK unlock screen.
 2011-09-22 23:44:43 -07:00