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

40373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Pelly
6165985652 am a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread 
* commit 'a29bf14e1d2857debc632ce4304a1c72dded348c':
  New Intent defined for RF ON/OFF events
 2011-01-26 20:40:46 -08:00
Kenny Root
558f8b8676 am e8c04db7: (-s ours) Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread 
* commit 'e8c04db71e347396e9537ead7113ba9f46706e44':
  Add the {get,set}PackageObbPaths calls to API
 2011-01-26 20:40:17 -08:00
Jaikumar Ganesh
d8171e65f9 am c8f42fb6: (-s ours) Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread 
* commit 'c8f42fb69867f171c04013b1b1a8f7e897ae3685':
  DO NOT MERGE: Remove auto connection on ACL connection.
 2011-01-26 16:19:55 -08:00
Eric Laurent
7cd7ac1290 am bec4abaa: Merge "Fix issue 3302649." into gingerbread 
* commit 'bec4abaa12bf6759f354b54119c5524cf9339e7b':
  Fix issue 3302649.
 2011-01-26 16:19:34 -08:00
Justin Ho
81c4c37ffd am 7b667a0c: (-s ours) Merge "Updated flightmode assets" into gingerbread 
* commit '7b667a0c4b017af3c6b9e1f8a6dae56e2c53e07f':
  Updated flightmode assets
 2011-01-26 16:19:13 -08:00
Kenny Root
ba031e2e8a am 6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread 
* commit '6688b6c31765242866fc276cea7fa241fc5b5e7b':
  Allow updated system apps to retain priority
 2011-01-26 13:04:03 -08:00
Andreas Huber
5a18073c02 am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed. 
* commit '7c6153606cc963191362494c8cb5669749e84326':
  Fail to parse duration instead of asserting, if the server response cannot be parsed.
 2011-01-26 11:02:10 -08:00
Andreas Huber
0c8ae8027b am 7e2f9cc8: (-s ours) DO NOT MERGE: Fix Matroska issues 
* commit '7e2f9cc81da788006790365ff11f06551fc1bc26':
  DO NOT MERGE: Fix Matroska issues
 2011-01-26 11:01:50 -08:00
Andreas Huber
72bd5d8217 am e7fbfb6b: (-s ours) Merge "DO NOT MERGE: Fix parsing of ntp= PLAY response." into gingerbread 
* commit 'e7fbfb6b745f56eeb394785932451aa0f2aa07d9':
  DO NOT MERGE: Fix parsing of ntp= PLAY response.
 2011-01-26 11:01:14 -08:00
Kenny Root
f4b2c0422c am 91c459ec: Copy user info from PackageSetting as well 
* commit '91c459ec7dba6d56816ff5cbd92c627e0f718915':
  Copy user info from PackageSetting as well
 2011-01-26 11:00:20 -08:00
Chung-yih Wang
72cadd2b44 am 65ba2c42: Merge "Add auth. username in SipProfile." into gingerbread 
* commit '65ba2c421c19fde04e6b294087a5a9c507964575':
  Add auth. username in SipProfile.
 2011-01-26 10:59:51 -08:00
Jeff Hamilton
71208ce454 resolved conflicts for merge of ca36d863 to honeycomb-merge 
Change-Id: Idb00dc86e265b2aaed8852912e1f9d8659fd2835
 2011-01-26 11:27:51 -06:00
Martijn Coenen
59ad6ed879 am 25be5365: Implement canMakeReadonly(). 
* commit '25be53652167300183282d170a00a6df576523f5':
  Implement canMakeReadonly().
 2011-01-25 16:16:53 -08:00
James Dong
2188caf172 am 13d1cb56: (-s ours) Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread 
* commit '13d1cb56dfdfc89888de6a0389b0fe6cf7e36c27':
  Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
 2011-01-25 16:16:32 -08:00
Nick Pelly
01a2868985 am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread 
* commit '92939376199a08fa0a3b01759579a4979c2a94a2':
  Remove attemptDeadServiceRecovery() from TagTechnology's.
 2011-01-25 16:16:05 -08:00
Nick Pelly
30098efbca resolved conflicts for merge of d64d711d to honeycomb-merge 
Change-Id: Ibe2c6d9f3d0070fb62f8385a9f49e605be37c885
 2011-01-25 16:13:17 -08:00
Dianne Hackborn
318041d41c am 9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread 
* commit '9aac2e2b9541c424ca02483631b08949f0e90c8c':
  Referencing of "r.record.name" is occured, when "r.record" is null.
 2011-01-25 15:52:15 -08:00
Chris Tate
b14abaa352 am bbff7ed4: (-s ours) DO NOT MERGE : Ensure that the first post-restore backup pass is correct 
* commit 'bbff7ed44b353ff299b900a1ff50812a082206f0':
  DO NOT MERGE : Ensure that the first post-restore backup pass is correct
 2011-01-25 15:51:54 -08:00
Chris Tate
f90b221ab1 am 6ec91731: (-s ours) DO NOT MERGE : Permission fix: don\'t require BACKUP perm for self-restores 
* commit '6ec91731cbf6ee1a9a914d341fab9567d1599018':
  DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
 2011-01-25 15:51:30 -08:00
Dianne Hackborn
692d313ef7 am 433863b1: Fix issue #3333958: Package Manager can sometimes mistakenly think... 
* commit '433863b1085248a8fdc9bcd0ac8501cc6a7b8ace':
  Fix issue #3333958: Package Manager can sometimes mistakenly think...
 2011-01-25 15:51:08 -08:00
Dianne Hackborn
49c60e2f58 am cd23823d: Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." into gingerbread 
* commit 'cd23823d4f533431c76baa104eb50b7803b3b391':
 2011-01-25 15:50:44 -08:00
Scott Main
6a41b4cc77 am 9b447d12: (-s ours) docs: catchup gingerbread to gingerbread-docs with misc changes 
* commit '9b447d122a2f0a4798f03749e9d93b9a58834fe3':
  docs: catchup gingerbread to gingerbread-docs with misc changes
 2011-01-25 15:45:58 -08:00
Scott Main
8d6ad873b0 am 3d0f0108: cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard 
* commit '3d0f0108f9487512195c7344be2417c30a93c3fc':
  cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
 2011-01-25 15:36:41 -08:00
Scott Main
2b0ec4fe04 am c5602aee: fix bug 3295540 
* commit 'c5602aeea3f4962dcb66d7a9e4a733259d5c12d5':
  fix bug 3295540
 2011-01-25 15:36:17 -08:00
Yu Shan Emily Lau
18bb1ce02f am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into gingerbread 
* commit '2af4e71dd47565d794ad48041a156871396a7dde':
  Fix the test application orientation. Bug# 3205196
 2011-01-25 15:21:41 -08:00
Gilles Debunne
303ecb9217 am 9ffb0a0d: (-s ours) Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread 
* commit '9ffb0a0df3a97115234bd50a73ca60efcefb4ef7':
  Ran fixPngMetaTags on all the core/res assets.
 2011-01-25 15:20:38 -08:00
Gilles Debunne
b61da08ce1 am 97664784: (-s ours) Merge "Asset cleanup. DO NOT MERGE" into gingerbread 
* commit '976647841cc9e52c373679c930d06d81310ff289':
  Asset cleanup. DO NOT MERGE
 2011-01-25 14:58:31 -08:00
Marco Nelissen
db791574e9 am f13d4501: (-s ours) Send "compilation" tag when inserting into the database. It\'s not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831 
* commit 'f13d4501396aa1679004ad07d440f65ced3ecc2b':
  Send "compilation" tag when inserting into the database. It's not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831
 2011-01-25 14:58:08 -08:00
Marco Nelissen
7fffccddae am ba77a3f9: (-s ours) Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831 
* commit 'ba77a3f9cb1d68b2ed4813aaae856444578e3a75':
  Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
 2011-01-25 12:51:41 -08:00
Nick Pelly
0c57adce34 am f54ad8da: Clean up transceive(). 
* commit 'f54ad8daf6f9dc2b9670ab1abbbfa4308b40bc6a':
  Clean up transceive().
 2011-01-25 12:39:25 -08:00
Eric Fischer
88fb11dee5 am 06d19ef0: (-s ours) Merge "Import translations for additional languages." into gingerbread 
* commit '06d19ef0a0f29d9a0bec63097ec443815512e9b1':
  Import translations for additional languages.
 2011-01-25 12:39:03 -08:00
Jeff Hamilton
4f1b04ac47 resolved conflicts for merge of 0aea1836 to honeycomb-merge 
Change-Id: I5aa17ff6dc9037815c3ec3e6e4b18183aedbbdf2
 2011-01-25 14:35:55 -06:00
Dianne Hackborn
93dd6a6ad1 am 3ea5728e: Tweak level at which we reset battery stats to 90%. 
* commit '3ea5728e703554f8ba0bb3aa1367d6dc45d704bb':
  Tweak level at which we reset battery stats to 90%.
 2011-01-25 10:45:33 -08:00
Adam Powell
bffb0a2586 Merge "Fix bug 3237638 - make it easy to change a "refresh" AB button/icon into the indeterminate progress icon" into honeycomb 2011-01-24 14:23:36 -08:00
Adam Powell
abbcc241c0 Fix bug 3237638 - make it easy to change a "refresh" AB button/icon 
into the indeterminate progress icon

This fixes a bug that caused ActionViews to not be updated properly
after a pass through invalidateOptionsMenu/onPrepareOptionsMenu. Apps
can now set/clear action views to display progress spinner widgets or
anything else on demand.

Change-Id: I138eceb504177c6bb5b86d40a68a82973aa841a5
 2011-01-24 14:03:16 -08:00
Andreas Huber
bc5172fe66 Merge "Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder" into honeycomb 2011-01-24 13:57:11 -08:00
Eric Fischer
f7358996d3 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-01-24 13:46:28 -08:00
Andreas Huber
a8385dd7c1 Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder 
Change-Id: Ia22ebce66d9c35de4b04c3eedc9495847796901d
related-to-bug: 3384367
 2011-01-24 13:36:30 -08:00
Andreas Huber
c45d3ad084 Merge "The .mkv parser lib leaves some tracks NULL if it doesn't support them." into honeycomb 2011-01-24 13:29:58 -08:00
Huahui Wu
94b8b114ab Merge "A few small cleanning-ups." into honeycomb 2011-01-24 13:25:17 -08:00
Daniel Sandler
1e25a23f9d Merge "Vertically align SSID/PLMN on lockscreen." into honeycomb 2011-01-24 13:14:35 -08:00
Justin Ho
7040e33c18 Merge "Updated checkbox assets for legacy applications" into honeycomb 2011-01-24 12:55:29 -08:00
Daniel Sandler
bfa8983b65 Vertically align SSID/PLMN on lockscreen. 
Bug: 3373818
Change-Id: Ie20584c5247bd52e376ddcb97205ba967ce3a8ea
 2011-01-24 15:52:46 -05:00
Andreas Huber
dfe8d9b1ff The .mkv parser lib leaves some tracks NULL if it doesn't support them. 
But it still counts them as valid tracks...

Change-Id: I77e8fd24cce91a586e8e418759db55b6eba449c0
related-to-bug: 3377186
 2011-01-24 12:46:12 -08:00
Eric Fischer
a1a8d941c2 Import revised translations. DO NOT MERGE 
Change-Id: I4babd2856874af87e991dab0f5c9696e54ca49b4
 2011-01-24 12:35:32 -08:00
Huahui Wu
f93246923f A few small cleanning-ups. 
1. Remove mDeferMultiTouch in WebView, it was for testing only but
we don't need it now since we always pass MultiTouch to WebKit.

2. Remove the use of mDeferMultiTouch in DRT tests.

3. Correct the index of getX(Y) for the second touch point in the
debug string of MotionEvent.

Change-Id: Ib63cfc5935af1a169ed26b2b138f74908492bc18
 2011-01-24 12:07:37 -08:00
Justin Ho
ec42272205 Updated checkbox assets for legacy applications 
Change-Id: I30c39101b365a0bcc78e1b5ff67a9d2ae732e5ae
 2011-01-24 12:07:37 -08:00
Andreas Huber
da6f929584 Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (again)" into honeycomb 2011-01-24 10:45:59 -08:00
Santosh Madhava
3648691259 Merge "Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'" into honeycomb 2011-01-24 10:45:36 -08:00
Joe Onorato
da34e13bb4 Merge "Remove unwanted parameter (it was a typo)." into honeycomb 2011-01-24 10:43:55 -08:00