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

22488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
32f6a6c3c6 am c0c2076e: am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbread 
Merge commit 'c0c2076e9a4dfd3b30b988d4ddd78abf9ed83166'

* commit 'c0c2076e9a4dfd3b30b988d4ddd78abf9ed83166':
  Eliminate MCS_GIVE_UP state
 2010-10-10 11:15:44 -07:00
Gilles Debunne
ca2c482ffd am 5e3329b5: am e86a6b2a: Merge "Removed unused and broken screen_progress" into gingerbread 
Merge commit '5e3329b5fac117ed49c9c3ca2919a4b1533612c4'

* commit '5e3329b5fac117ed49c9c3ca2919a4b1533612c4':
  Removed unused and broken screen_progress
 2010-10-10 11:15:28 -07:00
Brad Fitzpatrick
d5fc1d46eb am b8d40d26: am 30f5c8fe: More DropBoxManager javadoc love. 
Merge commit 'b8d40d263bc18d1defc1e6980e8f922df8f8f321'

* commit 'b8d40d263bc18d1defc1e6980e8f922df8f8f321':
  More DropBoxManager javadoc love.
 2010-10-10 11:15:12 -07:00
Brad Fitzpatrick
b8c103870a am 992a9e50: am fd124570: Merge "DropBox.Entry javadoc syntax fix" into gingerbread 
Merge commit '992a9e507fb1f8da7358b4d805c034d934eb1810'

* commit '992a9e507fb1f8da7358b4d805c034d934eb1810':
  DropBox.Entry javadoc syntax fix
 2010-10-10 11:14:56 -07:00
Kenny Root
3e15047b34 am c296f22e: am 0145e36c: Revert "Only allow 8 OBBs to be mounted by a UID" 
Merge commit 'c296f22e713257271f95c2115df9e13d05d5687a'

* commit 'c296f22e713257271f95c2115df9e13d05d5687a':
  Revert "Only allow 8 OBBs to be mounted by a UID"
 2010-10-10 11:14:31 -07:00
Jean-Baptiste Queru
122d55eb0f resolved conflicts for merge of 5df4b5a7 to master 
Change-Id: Ib1ed63f79c4a094b1d4ba8ba74ee2bd68a35bfd2
 2010-10-10 11:09:45 -07:00
James Dong
136f52dde7 Merge "0-memcpy video recording framework" 2010-10-10 10:01:31 -07:00
Eric Rowe
6e572220bc am 82aacdde: (-s ours) am f8d2acdc: Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread 
Merge commit '82aacddef99e5cfc399d02702f2a336af8fbd59f'

* commit '82aacddef99e5cfc399d02702f2a336af8fbd59f':
  DO NOT MERGE Initialize bluetooth profiles in BT stress tests
 2010-10-10 09:09:20 -07:00
Wink Saville
0133acd980 am 2e99245e: am bbc80d34: Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread 
Merge commit '2e99245e0e0d64ba6ab9227154c7fad132559c01'

* commit '2e99245e0e0d64ba6ab9227154c7fad132559c01':
  Changed handling of onQueryCompelete to not use mimeType.
 2010-10-10 09:08:55 -07:00
Stephen Hines
1d1c550cef Merge "Remove pragma for RS export variables." 2010-10-09 00:21:56 -07:00
Romain Guy
e4a7fe28a4 Merge "Move GenerationCache to the utils directory." 2010-10-08 18:47:45 -07:00
James Dong
cf9db5798a Merge "Move Camera specific logic out from StagefrightRecorder to CameraSource" 2010-10-08 18:39:13 -07:00
Romain Guy
2e9706f7e3 Merge "Don't update 9patches on every frame." 2010-10-08 18:39:04 -07:00
Wu-cheng Li
9d121475d3 am 9df14085: am 29332971: Merge "Add javadoc for display orientation." into gingerbread 
Merge commit '9df140851375a977ad99390d71edf8b4a8382fd4'

* commit '9df140851375a977ad99390d71edf8b4a8382fd4':
  Add javadoc for display orientation.
 2010-10-08 18:28:38 -07:00
Hung-ying Tyan
f384f417f2 am 841d6ff9: am 62ec9834: Merge "Make SipService broadcast SIP_SERVICE_UP when it\'s up." into gingerbread 
Merge commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32'

* commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32':
  Make SipService broadcast SIP_SERVICE_UP when it's up.
 2010-10-08 18:28:20 -07:00
Adam Powell
d6a20a90dd resolved conflicts for merge of 86b50028 to master 
Change-Id: I3468e67ac17f861c5491717337c27cd49bd5287e
 2010-10-08 18:23:49 -07:00
Dianne Hackborn
d5bac8e190 am 18e225b4: am bfba7cab: Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback 
Merge commit '18e225b42b77c48efa63f245a4137c5f74302e26'

* commit '18e225b42b77c48efa63f245a4137c5f74302e26':
  Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback
 2010-10-08 17:59:52 -07:00
Eric Fischer
10187ad4a2 am 7778173a: (-s ours) am 70f1a3b8: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '7778173a32edcfccdcc31407169d2ec40916ca2f'

* commit '7778173a32edcfccdcc31407169d2ec40916ca2f':
  Import revised translations.  DO NOT MERGE
 2010-10-08 17:59:33 -07:00
Xavier Ducrohet
352c116386 am 556866a2: am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into gingerbread 
Merge commit '556866a2ea1f4758a79fe4f207153b71815ed400'

* commit '556866a2ea1f4758a79fe4f207153b71815ed400':
  Parser is optional in obtainStyledAttributes.
 2010-10-08 17:59:13 -07:00
Hung-ying Tyan
c4228f4e50 am 909a974f: am 16c29bd7: Merge "SIP: Fix busy authentication loop." into gingerbread 
Merge commit '909a974f8e5df4b6fc2cf8de6c64633406095c6e'

* commit '909a974f8e5df4b6fc2cf8de6c64633406095c6e':
  SIP: Fix busy authentication loop.
 2010-10-08 17:58:55 -07:00
Dianne Hackborn
cc14d48fb8 am 55f1b0b8: am 9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread 
Merge commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f'

* commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f':
  Make Activity.removeDialog() less strict.
 2010-10-08 17:58:35 -07:00
Kenny Root
3859ddecf3 am 6ed0cfd3: am 5919ac6b: OBB: track binder death observers 
Merge commit '6ed0cfd3e798e3014c9f1099631249463d25140c'

* commit '6ed0cfd3e798e3014c9f1099631249463d25140c':
  OBB: track binder death observers
 2010-10-08 17:58:15 -07:00
Kenny Root
e200a86950 am 36455d03: am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread 
Merge commit '36455d03256024981b1bf21557722a010b5e092a'

* commit '36455d03256024981b1bf21557722a010b5e092a':
  Add MountService tests and fix a bug it found
 2010-10-08 17:57:55 -07:00
Dianne Hackborn
f9e0b45a31 am e89bf502: am ef083ec0: Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread 
Merge commit 'e89bf50261902bf263887923bf95595ec8eae069'

* commit 'e89bf50261902bf263887923bf95595ec8eae069':
  Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
 2010-10-08 17:57:35 -07:00
Gilles Debunne
574d386c2d am f960718c: (-s ours) am 1ae32bfe: New assets for buttons and notification 
Merge commit 'f960718c1c02186746873ec4a669028bb8ea9d94'

* commit 'f960718c1c02186746873ec4a669028bb8ea9d94':
  New assets for buttons and notification
 2010-10-08 17:57:16 -07:00
Dianne Hackborn
1d7a7603e9 am cef38339: am 6d44456d: Merge "Make USB mass storage hide keyguard when shown." into gingerbread 
Merge commit 'cef38339e7d0af61783ad6d35793e2496f5a2b37'

* commit 'cef38339e7d0af61783ad6d35793e2496f5a2b37':
  Make USB mass storage hide keyguard when shown.
 2010-10-08 17:45:08 -07:00
Adam Powell
7754ca6618 Merge "Fix alert dialog layout size in landscape" 2010-10-08 17:10:24 -07:00
Chung-yih Wang
1293bb3f1d resolved conflicts for merge of 4790a2e2 to master 
Change-Id: I659ccd9a51e24f217f715178a98eaf6592c258d7
 2010-10-09 08:07:55 +08:00
Romain Guy
732d47e848 Merge "Better cache for layers, reduce memory usage and increase framerate." 2010-10-08 15:52:02 -07:00
Mike Dodd
8f6db42d1a Merge "HardwareRenderer: When throwing an exception because of an EGL error, include the specific error." 2010-10-08 15:33:45 -07:00
Joe Onorato
2a650b4a4f Merge "Allow notifications to not specify a contentIntent." 2010-10-08 15:16:14 -07:00
Alex Sakhartchouk
c4435df84c Merge "Removing fixed size arrays." 2010-10-08 15:04:29 -07:00
Gil Dobjanschi
839e38de8e Merge "Hide project media by creating the .nomedia file" 2010-10-08 14:57:05 -07:00
Vasu Nori
fddc45e351 Merge "when printing requery on UI warning, include additional info" 2010-10-08 14:50:59 -07:00
Irfan Sheriff
edeee9ccd1 Merge "Use LinkProperties for IP and proxy configuration" 2010-10-08 14:09:49 -07:00
Adam Powell
33600802b4 Merge "Holo theme progress and assets!" 2010-10-08 13:52:55 -07:00
Mathias Agopian
a1dce610f5 Merge "fix a bug where timeouts would only be handled when a message was delivered" 2010-10-08 13:46:07 -07:00
Joe Onorato
e6db8bcf0c Merge "Get rid of the global actions menu on tablets." 2010-10-08 13:29:37 -07:00
Jason Chen
68fd208a9e Merge "Resolved conflicts for merge of 2bd6afed to master" 2010-10-08 13:15:11 -07:00
Mike Lockwood
bb7ecd7ceb Merge "MTP: Throw a NullPointerException if client is null in MtpCursor constructor" 2010-10-08 13:12:39 -07:00
Jason Chen
e8050e929e Resolved conflicts for merge of 2bd6afed to master 
Change-Id: Ic9e854838004e9c5505cc1df8399cee3caa5e4e9
 2010-10-08 13:09:31 -07:00
Elliott Hughes
bea520eb25 Merge "NIOTest fixes." 2010-10-08 12:59:43 -07:00
Jim Miller
799c770e49 Merge "Fix RecentApps to properly load new thumbnails." 2010-10-08 12:53:14 -07:00
Jim Miller
73f83b4e21 Merge "Fix 3061025: Extend wave lockscreen timeout while grabbed." 2010-10-08 12:52:24 -07:00
Mathias Agopian
d2509c8dee Merge "Fix a null dereference" 2010-10-08 12:44:19 -07:00
Dianne Hackborn
981dd48ebb am 92d29c66: am a2a0a98a: Merge "Fix NPE if there is no accelerometer." into gingerbread 
Merge commit '92d29c66f5cb69627172d21057e672eaba2eb03f'

* commit '92d29c66f5cb69627172d21057e672eaba2eb03f':
  Fix NPE if there is no accelerometer.
 2010-10-08 12:39:14 -07:00
Dianne Hackborn
7ab6d2c3a2 resolved conflicts for merge of efa4f7f8 to master 
Change-Id: I00dff76594326a6f6e69515a9cba673602ed269d
 2010-10-08 11:09:38 -07:00
Hung-ying Tyan
f98a688419 am 88b4bd5f: am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread 
Merge commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f'

* commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f':
  CallManager/SipPhone: fix reject a ringing call
 2010-10-08 10:25:50 -07:00
Gilles Debunne
ceb931dcf2 Merge "resolved conflicts for merge of ba04dbc6 to master" 2010-10-08 09:20:57 -07:00
Daniel Sandler
028d06215e Merge "Start of input method control on system bar." 2010-10-08 08:14:12 -07:00