ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
22,510 Commits 2 Branches 0 Tags 54 MiB
2eb1995a5d
Commit Graph

22510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
5bb36168c6 Merge "Add two more options to "recordvideo" utility" 2010-10-07 11:00:25 -07:00
Andreas Huber
14fc691358 Merge "On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread 2010-10-07 10:57:32 -07:00
Mike Lockwood
130952d1c9 Merge "resolved conflicts for merge of 6327a9fe to master" 2010-10-07 10:57:08 -07:00
Mike Lockwood
e36abb1a90 resolved conflicts for merge of 6327a9fe to master 
Change-Id: I1a398a7100abf75d8df7ae9a3d6110829645ae64
 2010-10-07 13:55:25 -04:00
Kenny Root
707191f60a Merge "Eliminate MCS_GIVE_UP state" into gingerbread 2010-10-07 10:54:14 -07:00
Joe Onorato
3db1a4c16f Merge "Add extra to ACTION_BATTERY_CHANGED to indicate an invalid charger is attached." 2010-10-07 10:52:30 -07:00
Gilles Debunne
01bb31e340 Merge "Removed unused and broken screen_progress" into gingerbread 2010-10-07 10:52:11 -07:00
Brad Fitzpatrick
eeaba93ead Merge "DropBox.Entry javadoc syntax fix" into gingerbread 2010-10-07 10:20:32 -07:00
Joe Onorato
5eb1a08163 Merge "Don't crash if there is no phone app and someone presses the phone button." 2010-10-07 10:03:46 -07:00
John Wang
544dd8158b Merge "Add flag to skip restoring network seletion." into gingerbread 2010-10-07 09:47:01 -07:00
Robert Greenwalt
57ad4e3106 am b81b89f1: (-s ours) am 45a8901d: Merge "Add supporting MCC=450(Korea)" into gingerbread 
Merge commit 'b81b89f1bf8bd39e71f5209fe7ae80db3c100bb6'

* commit 'b81b89f1bf8bd39e71f5209fe7ae80db3c100bb6':
  Add supporting MCC=450(Korea)
 2010-10-07 09:25:54 -07:00
Eric Rowe
b6aae63bcf am f8d2acdc: Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread 
Merge commit 'f8d2acdc57fd747278bb909c9e15b959e07d63b6' into gingerbread-plus-aosp

* commit 'f8d2acdc57fd747278bb909c9e15b959e07d63b6':
  DO NOT MERGE Initialize bluetooth profiles in BT stress tests
 2010-10-07 09:19:37 -07:00
Wink Saville
f9e4c81d9b am bbc80d34: Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread 
Merge commit 'bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc' into gingerbread-plus-aosp

* commit 'bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc':
  Changed handling of onQueryCompelete to not use mimeType.
 2010-10-07 09:16:54 -07:00
Eric Rowe
353d0832fc Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread 2010-10-07 09:06:30 -07:00
Wink Saville
0e918d5345 Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread 2010-10-07 08:34:01 -07:00
James Dong
92833b243f Merge "0-memcpy video recording framework" 2010-10-07 08:11:26 -07:00
Wu-cheng Li
54c4e02dba am 29332971: Merge "Add javadoc for display orientation." into gingerbread 
Merge commit '29332971ddbace4ae3d645a67f28f717df8b1dbd' into gingerbread-plus-aosp

* commit '29332971ddbace4ae3d645a67f28f717df8b1dbd':
  Add javadoc for display orientation.
 2010-10-07 07:18:39 -07:00
Hung-ying Tyan
ff8d45dcd2 am 62ec9834: Merge "Make SipService broadcast SIP_SERVICE_UP when it\'s up." into gingerbread 
Merge commit '62ec9834a09c9037d195c306fd838b4c0425e7e2' into gingerbread-plus-aosp

* commit '62ec9834a09c9037d195c306fd838b4c0425e7e2':
  Make SipService broadcast SIP_SERVICE_UP when it's up.
 2010-10-07 07:18:27 -07:00
Adam Powell
521236627d am fbb3b476: Fix bug 3066313 - integrate new text anchor assets. 
Merge commit 'fbb3b4768e858f004fe9a87e83b066244c829d87' into gingerbread-plus-aosp

* commit 'fbb3b4768e858f004fe9a87e83b066244c829d87':
  Fix bug 3066313 - integrate new text anchor assets.
 2010-10-07 07:18:21 -07:00
Dianne Hackborn
c675af2fb2 am bfba7cab: Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback 
Merge commit 'bfba7cab94cd9cf28e561159dbbe934dc83a6f0a' into gingerbread-plus-aosp

* commit 'bfba7cab94cd9cf28e561159dbbe934dc83a6f0a':
  Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback
 2010-10-07 07:18:08 -07:00
Eric Fischer
b9083a3521 am 70f1a3b8: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c' into gingerbread-plus-aosp

* commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c':
  Import revised translations.  DO NOT MERGE
 2010-10-07 07:16:56 -07:00
Xavier Ducrohet
84d2368969 am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into gingerbread 
Merge commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a' into gingerbread-plus-aosp

* commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a':
  Parser is optional in obtainStyledAttributes.
 2010-10-07 07:16:51 -07:00
Hung-ying Tyan
b4bfd7d6b3 am 16c29bd7: Merge "SIP: Fix busy authentication loop." into gingerbread 
Merge commit '16c29bd7f2ce147fd2f39f1f36df88d1b04a5387' into gingerbread-plus-aosp

* commit '16c29bd7f2ce147fd2f39f1f36df88d1b04a5387':
  SIP: Fix busy authentication loop.
 2010-10-07 07:16:45 -07:00
Dianne Hackborn
a0182e230b am 9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread 
Merge commit '9d6824cd53960b4562ea3c55876b40ca21710050' into gingerbread-plus-aosp

* commit '9d6824cd53960b4562ea3c55876b40ca21710050':
  Make Activity.removeDialog() less strict.
 2010-10-07 07:16:34 -07:00
Kenny Root
05da721624 am 5919ac6b: OBB: track binder death observers 
Merge commit '5919ac6b4188285324646772501ef4b97b353cf4' into gingerbread-plus-aosp

* commit '5919ac6b4188285324646772501ef4b97b353cf4':
  OBB: track binder death observers
 2010-10-07 07:16:18 -07:00
Kenny Root
ac520689e2 am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread 
Merge commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed' into gingerbread-plus-aosp

* commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed':
  Add MountService tests and fix a bug it found
 2010-10-07 07:16:08 -07:00
Dianne Hackborn
1e572218ab am ef083ec0: Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread 
Merge commit 'ef083ec008a3ec69180340912e7f0137472c97d9' into gingerbread-plus-aosp

* commit 'ef083ec008a3ec69180340912e7f0137472c97d9':
  Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
 2010-10-07 07:15:57 -07:00
Gilles Debunne
114758caea am 1ae32bfe: New assets for buttons and notification 
Merge commit '1ae32bfebf5102774cbf6424885f84e4630925c4' into gingerbread-plus-aosp

* commit '1ae32bfebf5102774cbf6424885f84e4630925c4':
  New assets for buttons and notification
 2010-10-07 07:15:05 -07:00
Dianne Hackborn
7ed74e0fb2 am 6d44456d: Merge "Make USB mass storage hide keyguard when shown." into gingerbread 
Merge commit '6d44456da87dccb15b4086696f5e72a5aa198926' into gingerbread-plus-aosp

* commit '6d44456da87dccb15b4086696f5e72a5aa198926':
  Make USB mass storage hide keyguard when shown.
 2010-10-07 07:13:47 -07:00
Wu-cheng Li
3c2dc49b88 Merge "Add javadoc for display orientation." into gingerbread 2010-10-07 05:49:27 -07:00
Hung-ying Tyan
6a046de26f Merge "Make SipService broadcast SIP_SERVICE_UP when it's up." into gingerbread 2010-10-06 23:11:09 -07:00
satok
90b05f7bce Merge "Add InputMethodEnabler for enabling input methods and subtypes" 2010-10-06 22:46:32 -07:00
Romain Guy
d102389f27 Merge "Don't clear the framebuffer when not needed." 2010-10-06 19:51:36 -07:00
Eric Fischer
3237326c9d Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-06 17:32:17 -07:00
Xavier Ducrohet
32bafef825 Merge "Parser is optional in obtainStyledAttributes." into gingerbread 2010-10-06 17:32:10 -07:00
Hung-ying Tyan
bca588d6fc Merge "SIP: Fix busy authentication loop." into gingerbread 2010-10-06 17:29:28 -07:00
Dianne Hackborn
98fd36fe24 Merge "Make Activity.removeDialog() less strict." into gingerbread 2010-10-06 17:26:16 -07:00
Brett Chabot
bb81a558a0 am 111a4135: am b9a40068: Merge "Failing test cleanup." into gingerbread 
Merge commit '111a4135d84485eff85bbca6a96cd91886deb7ba'

* commit '111a4135d84485eff85bbca6a96cd91886deb7ba':
  Failing test cleanup.
 2010-10-06 17:10:48 -07:00
Adam Powell
b7a8ae8cee am 41170a1a: am abcbb1a1: Fix bug 3061544 and some clipping errors. 
Merge commit '41170a1a05830e6c9ec631d73043ccf1878dc0f9'

* commit '41170a1a05830e6c9ec631d73043ccf1878dc0f9':
  Fix bug 3061544 and some clipping errors.
 2010-10-06 17:08:52 -07:00
Hung-ying Tyan
fd11889bdd am a785a59c: am 718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread 
Merge commit 'a785a59c831256f274627f8f8eb77f9d54508916'

* commit 'a785a59c831256f274627f8f8eb77f9d54508916':
  SIP: add SERVER_UNREACHABLE error code.
 2010-10-06 17:08:43 -07:00
Hung-ying Tyan
fb7246923f am 3cb2d3be: am 1862af57: Merge "SipService: supply PendingIntent when open a profile." into gingerbread 
Merge commit '3cb2d3be6cb501c77c7a5765d954363125857cca'

* commit '3cb2d3be6cb501c77c7a5765d954363125857cca':
  SipService: supply PendingIntent when open a profile.
 2010-10-06 17:08:34 -07:00
Dianne Hackborn
b19b10d1af am cb9f1e4d: am 6f7e10ca: Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread 
Merge commit 'cb9f1e4d30ab4f9203e30abe807cbe33d07db4a0'

* commit 'cb9f1e4d30ab4f9203e30abe807cbe33d07db4a0':
  Make it easier to figure out whether an app can go on sd card.
 2010-10-06 17:08:15 -07:00
Neal Nguyen
ec8a3938e4 am daa9b8c6: am 95037fb1: Merge "Fixing some flakiness of some DL Manager tests." into gingerbread 
Merge commit 'daa9b8c69a3069d5533176e6caa286380b4675c2'

* commit 'daa9b8c69a3069d5533176e6caa286380b4675c2':
  Fixing some flakiness of some DL Manager tests.
 2010-10-06 17:07:58 -07:00
Jeff Brown
25d89261d3 am f358cecb: am 79a3981e: Fix Looper leaks in MediaRecorderStressTest. 
Merge commit 'f358cecb9cb2853ba0d6f54f350a92b1b5e247b2'

* commit 'f358cecb9cb2853ba0d6f54f350a92b1b5e247b2':
  Fix Looper leaks in MediaRecorderStressTest.
 2010-10-06 17:07:49 -07:00
Mathias Agopian
e1c290b97d am ff04e97f: am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread 
Merge commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb'

* commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb':
  fix [2835280] Add support for cancelling buffers to ANativeWindow
 2010-10-06 17:07:39 -07:00
Mathias Agopian
fbd5d01528 am 722665c5: am ef115308: fix build. SurfaceView.setFrame needed to be hidden 
Merge commit '722665c5f76e81bed646490977ea30f38aaa00da'

* commit '722665c5f76e81bed646490977ea30f38aaa00da':
  fix build. SurfaceView.setFrame needed to be hidden
 2010-10-06 17:07:30 -07:00
Mathias Agopian
0e7e760651 Merge "resolved conflicts for merge of bba3b8ef to master" 2010-10-06 17:04:44 -07:00
Mathias Agopian
c502f54cca resolved conflicts for merge of bba3b8ef to master 
Change-Id: I4a63f4be3b9f7d236e03e9b27f6d1da6f8ced449
 2010-10-06 17:03:41 -07:00
Romain Guy
9fae8611c7 Merge "Apply 3D transformations to gradient shaders." 2010-10-06 17:00:20 -07:00
Kenny Root
a135d25422 Merge "Add MountService tests and fix a bug it found" into gingerbread 2010-10-06 16:59:23 -07:00