ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
31,971 Commits 2 Branches 0 Tags 54 MiB
1c503c26e0
Commit Graph

31971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
ebbb2704e0 Merge "Tweak RIL.java debug." into honeycomb-LTE 2011-03-22 16:05:22 -07:00
Wink Saville
70fd41bf35 Merge "Remove unused onResetDone." into honeycomb-LTE 2011-03-22 15:30:41 -07:00
Eric Fischer
e0b5cead10 am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '3a2575f7e6b1f6da97bd8233dfd3baa8883c5610':
  Import revised translations.  DO NOT MERGE
 2011-03-22 13:59:20 -07:00
Eric Fischer
3e8b4373f1 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-22 13:56:47 -07:00
Teng-Hui Zhu
632de2d17f am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1 
* commit '5039e6da1e74c0a0c10772f585ea4e5e6bcf0a16':
  fix for pause when loading
 2011-03-22 13:56:35 -07:00
Teng-Hui Zhu
ae01e99c1a Merge "fix for pause when loading" into honeycomb-mr1 2011-03-22 13:55:28 -07:00
Dianne Hackborn
594b57954b am 8dcd6647: Merge "Now have a final API 12." into honeycomb-mr1 
* commit '8dcd66476069c9241c2acbbafc1a85e42bd7a303':
  Now have a final API 12.
 2011-03-22 13:01:19 -07:00
Dianne Hackborn
38475e7294 Merge "Now have a final API 12." into honeycomb-mr1 2011-03-22 12:58:00 -07:00
shailendra
5096f083b6 am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1 
* commit '8483073ec21b5e2332deaad914eba1d087b1d1e3':
  Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
 2011-03-22 11:50:15 -07:00
shailendra
6e7b75f517 Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1 2011-03-22 11:48:12 -07:00
Gloria Wang
79ee4c6b6e am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1 
* commit '3cc797b9c416e01ad6bfab5f2bfb2c6cbf9e44ed':
  Add one more field in DecryptHandle to support bug 4126624
 2011-03-22 11:06:43 -07:00
Gloria Wang
cbd0c8a74f Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1 2011-03-22 11:04:32 -07:00
Andreas Huber
bb76e23360 am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1 
* commit '453c0d5f16a09473b0653566973bf8b6a867cf79':
  DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
 2011-03-22 08:48:58 -07:00
Andreas Huber
2a15f0fb93 Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1 2011-03-22 08:37:58 -07:00
Teng-Hui Zhu
da63f57cb6 am 039aa81a: Merge "Fix a crash" into honeycomb-mr1 
* commit '039aa81a67465f189c24f92567ccb08ed8a5dce2':
  Fix a crash
 2011-03-21 18:13:21 -07:00
Teng-Hui Zhu
0cccea1543 Merge "Fix a crash" into honeycomb-mr1 2011-03-21 18:09:57 -07:00
Yu Shan Emily Lau
7eca96ee8d am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1 
* commit '0210997218fc22b77c71a43a2396419cd0a39166':
  Add the mem logging into test utility. Bug# 4108259
 2011-03-21 18:00:32 -07:00
Gloria Wang
df2d7283d9 am 7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1 
* commit '7abedd0cdefdcd6d3b62808724e721bb1b92b185':
  do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
 2011-03-21 18:00:30 -07:00
Justin Ho
6c75f56b1c am 9db9a7d3: Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 
* commit '9db9a7d3f4428552b3ce553df5184bcbbe8db8dd':
  Fixing list selector theme Bug: 4147203
 2011-03-21 17:59:59 -07:00
Yu Shan Emily Lau
10399b194f Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1 2011-03-21 17:32:17 -07:00
Gloria Wang
838c9844f7 Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1 2011-03-21 17:26:03 -07:00
Justin Ho
6967dd8e24 Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 2011-03-21 16:52:35 -07:00
Andreas Huber
4c7fba719a am e2c32e9f: If nothing is to be copied, return right away. 
* commit 'e2c32e9f966cf9f2c9ed94bf0703344a2cca284b':
  If nothing is to be copied, return right away.
 2011-03-21 16:21:29 -07:00
Teng-Hui Zhu
8960381aa9 am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1 
* commit '0b933c02dddbc325498b3b73d8be9167b155801b':
  Support loading image and paused image for inline video
 2011-03-21 14:19:29 -07:00
Teng-Hui Zhu
0953e89934 Merge "Support loading image and paused image for inline video" into honeycomb-mr1 2011-03-21 14:01:10 -07:00
Justin Ho
a50dad82b5 am 5e35c485: Updated 3G and wifi traffic indicators 
* commit '5e35c4855a972960403a10811882ebded8945006':
  Updated 3G and wifi traffic indicators
 2011-03-21 10:54:51 -07:00
Mike Lockwood
ba33281a5f am dd76dc02: Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1 
* commit 'dd76dc0297f4c39fefbbc1ac23d9b1add187d9e9':
  UsbService: Handle the case where a USB accessory connects as the device is booting
 2011-03-20 17:25:09 -07:00
Mike Lockwood
731d1353d3 Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1 2011-03-20 17:08:24 -07:00
Jamie Gennis
560fe009e5 am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1 
* commit '38caff230d1ee52701cc8cffde0309b91c2016d6':
  SurfaceFlinger: Fix a typo.
 2011-03-18 17:34:27 -07:00
Jamie Gennis
d32a694a0c Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1 2011-03-18 17:32:25 -07:00
Jamie Gennis
5fd799dab6 SurfaceFlinger: Fix a typo. 
This change makes Layer skip its cleanup of its old shared memory region
when the UserClient object that owned the memory has been freed.

Bug: 3429357
Change-Id: I9e4d8eb190f6914dc043674b9bb8dd28e959901b
 2011-03-18 16:35:13 -07:00
Russell Brenner
bd7b09f841 am a0dc8da2: Merge "DO NOT MERGE Send WebView the current transform and whether we\'re drawing a layer. Bug #3275491" into honeycomb-mr1 
* commit 'a0dc8da2ab0a084432c7094e434b7957dd2eaf5c':
  DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491
 2011-03-18 15:32:18 -07:00
Russell Brenner
b36926abde Merge "DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491" into honeycomb-mr1 2011-03-18 15:28:27 -07:00
Teng-Hui Zhu
3b9b781405 am 7eaf4831: Merge "Asset for video poster" into honeycomb-mr1 
* commit '7eaf483140f1c42f29c7cde71061521280b253ce':
  Asset for video poster
 2011-03-18 15:22:03 -07:00
Teng-Hui Zhu
c53cb0d36c Merge "Asset for video poster" into honeycomb-mr1 2011-03-18 15:19:28 -07:00
Daisuke Miyakawa
bf4b3f73ce am b02d3956: am e16a1bfa: Use system locale list. 
* commit 'b02d395650a9a5fb13812cefa0ada1501f5b6d62':
  Use system locale list.
 2011-03-18 11:27:22 -07:00
Daisuke Miyakawa
48a27defe9 am e16a1bfa: Use system locale list. 
* commit 'e16a1bfa9cd9a9a0430e2fe890586ae451f0faaf':
  Use system locale list.
 2011-03-18 11:23:00 -07:00
Derek Sollenberger
529f878975 am 5750bb7d: Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1 
* commit '5750bb7d8f59c0f8e18baaa60bcb492c867db590':
  Prevent intermediate scale updates from being sent to WebKit while zooming.
 2011-03-18 11:02:45 -07:00
shailendra
e6fb416547 am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1 
* commit '0d922ec92dfe1d4adb6c66cdd2d3c16eb6b29776':
  Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
 2011-03-18 11:02:35 -07:00
Derek Sollenberger
800094d7d1 Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1 2011-03-18 10:57:46 -07:00
shailendra
886c92028f Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1 2011-03-18 09:35:37 -07:00
Dianne Hackborn
1828fd2a08 am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1 
* commit '1d50ad7914de36b63a04d39bdc4791c1dadc7eae':
  Whoops, forgot the HONEYCOMB_MR1 constant. :(
 2011-03-17 19:02:15 -07:00
Dianne Hackborn
acf8cb2596 Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1 2011-03-17 19:00:56 -07:00
Huahui Wu
1b3437371d am b1c43c32: Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1 
* commit 'b1c43c32f518240fd75963ffc8e82cb13e036390':
  b/4116658 Fix the jumpy scrolling with some flash site.
 2011-03-17 18:11:04 -07:00
Huahui Wu
f6fb4ed1dc Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1 2011-03-17 18:09:33 -07:00
Wink Saville
c57bb62954 am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1 
* commit '651f38d71788d6b1d50cb6c9810ba31f903407d9':
  Change stopship to todo.
 2011-03-17 18:00:55 -07:00
Wink Saville
b77b4807d0 Merge "Change stopship to todo." into honeycomb-mr1 2011-03-17 17:58:06 -07:00
Justin Ho
8ca8908e0f am 5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1 
* commit '5dbd0978cd7f2d3ff1e28bbfdef2f757de28e1bc':
  Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF
 2011-03-17 17:55:58 -07:00
James Dong
0db849a855 am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1 
* commit 'be368de7b7614e89bae8fb59ea4283eba890a2c1':
  Fix missing AOSP copyright headers for more files
 2011-03-17 17:55:48 -07:00
Justin Ho
c14e692d62 Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1 2011-03-17 16:49:32 -07:00