ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
14,574 Commits 2 Branches 0 Tags 54 MiB
f7ac9f5f68
Commit Graph

14574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
f7ac9f5f68 merge from open-source master 
Change-Id: I7a9f23192372fc6973d9f3eb399f895f4765f6b2
 2010-06-14 11:06:33 -07:00
The Android Open Source Project
07ba8effde merge from open-source master 
Change-Id: Ic1ad1c55b5f4560b51c6b422b6f086c95a6fd69e
 2010-06-14 11:02:30 -07:00
The Android Open Source Project
16f60b78d4 merge from open-source master 
Change-Id: I5d19eb677dcfc7b73919d659fafb29fb85dc7f47
 2010-06-14 10:57:53 -07:00
Jean-Baptiste Queru
ac3e5138d6 Merge "Added an addAll to the ArrayAdapter" 2010-06-14 09:27:14 -07:00
Jean-Baptiste Queru
511be955d9 Merge "Should accept "application/vnd.wap.multipart.alternative" message." 2010-06-14 08:56:49 -07:00
Dirk Dougherty
ed7e29fac3 am 1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo 
Merge commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b' into froyo-plus-aosp

* commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b':
  Doc change: remove pdf summary of guidelines from templates archive.
 2010-06-11 16:57:45 -07:00
Dirk Dougherty
6c622422b6 Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo 2010-06-11 16:49:14 -07:00
Irfan Sheriff
96c05c8df0 merge from open-source master 
Change-Id: I8a950276787e9439420db396d0e32f88bd6e04cc
 2010-06-11 15:14:29 -07:00
The Android Open Source Project
24ad68f215 merge from open-source master 
Change-Id: Ia668b322a02e220b74c222dbbcc5b4fdc3c59ab0
 2010-06-11 13:08:02 -07:00
Jean-Baptiste Queru
1bfdbf7165 Merge "WLAN: Reset power save mode to startup value after DHCP response." 2010-06-11 11:12:15 -07:00
Irfan Sheriff
8a9a65637a am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo 
Merge commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b' into froyo-plus-aosp

* commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b':
  Remove indefinite DHCP retries
 2010-06-10 19:02:13 -07:00
Irfan Sheriff
c17564db5a Merge "Remove indefinite DHCP retries" into froyo 2010-06-10 18:56:04 -07:00
Mike Lockwood
1550bc01c1 am f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo 
Merge commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4' into froyo-plus-aosp

* commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4':
  Don't adjust lights if screen or button brightness is changed when the screen is off.
 2010-06-10 15:30:33 -07:00
Mike Lockwood
68c92f3410 Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo 2010-06-10 15:28:31 -07:00
Adam Powell
113d0fda7b am 8f2ca788: Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo 
Merge commit '8f2ca788f369892370477212cf9e7a67721a8c16' into froyo-plus-aosp

* commit '8f2ca788f369892370477212cf9e7a67721a8c16':
  Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down.
 2010-06-10 14:14:44 -07:00
Adam Powell
a9d563290e Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo 2010-06-10 14:09:50 -07:00
Nick Kralevich
168a7eca42 am a2c6d5bf: do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch 
Merge commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c' into froyo-plus-aosp

* commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c':
  do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
 2010-06-10 11:50:51 -07:00
Kenny Root
aed039d604 am b00854d4: Import revised translations 
Merge commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e' into froyo-plus-aosp

* commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e':
  Import revised translations
 2010-06-09 22:32:01 -07:00
The Android Open Source Project
5e1b2f531d merge from open-source master 
Change-Id: I4ddfc902e70c85ab8b11698fc08df7247e46d0a9
 2010-06-09 12:17:03 -07:00
The Android Open Source Project
0887ab4d10 merge from open-source master 
Change-Id: Iaf90d2aaa3cb3a435336c2ccd08b587d9fc3690b
 2010-06-09 12:14:58 -07:00
Jean-Baptiste Queru
1e254923ea Merge "Adding mimetypes to the mimetype map used in the web view" 2010-06-09 10:51:16 -07:00
The Android Open Source Project
ae68e08411 ignore from open-source master 
Change-Id: I534482f2c6ef252d704809fb0ce2f38f9f3d0cef
 2010-06-09 09:21:39 -07:00
Jean-Baptiste Queru
64ba44a221 Merge "Fix for deadlock between StatusBarService and NotificationManagerService" 2010-06-09 07:28:50 -07:00
The Android Open Source Project
1e94155433 merge from open-source master 
Change-Id: I1fd774738c01a2cdffac0d455c63d574131e6fb8
 2010-06-09 07:14:36 -07:00
Jim Miller
91874c12e2 am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo 
Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into froyo-plus-aosp

* commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
  Fix 2737842: Disable KeguardManager API if device policy is enabled
 2010-06-08 16:33:22 -07:00
Jim Miller
5ca447aa0c Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo 2010-06-08 16:31:32 -07:00
Jean-Baptiste Queru
2b4c33ff92 Merge "Bluetooth:LCD wakeup during remote BT pairing request. This change fixes the issue of LCD not coming up during remote initiated pairing request when android is in suspend" 2010-06-08 15:43:02 -07:00
The Android Open Source Project
57e32fb1ce merge from open-source master 
Change-Id: Id2305d345a6cc248e08c0bdc6f3c8d999cc1d861
 2010-06-08 13:17:41 -07:00
Romain Guy
002415834b am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo 
Merge commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into froyo-plus-aosp

* commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
  Add a method to hide/show a SurfaceView's surface.
 2010-06-08 13:01:05 -07:00
Romain Guy
649329c3da Merge "Add a method to hide/show a SurfaceView's surface." into froyo 2010-06-08 12:59:36 -07:00
Jean-Baptiste Queru
56d23925ed Merge "Fixed problem with proxy server sometimes responds with 400 Bad Request when trying to connect to a site using https." 2010-06-08 10:19:51 -07:00
Jim Miller
9ae0a98f37 am cb52cb52: Fix SDK build. 
Merge commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0' into froyo-plus-aosp

* commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0':
  Fix SDK build.
 2010-06-07 21:23:33 -07:00
Jim Miller
4c58e3ac69 am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo 
Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into froyo-plus-aosp

* commit 'bde25c207731783a62e3611586fe05cd35add0d9':
  Fix 2737842: disable keyguard API when device policy is enabled.
 2010-06-07 19:26:28 -07:00
Jim Miller
c354b89c76 Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo 2010-06-07 19:24:45 -07:00
Christopher Tate
f023c4ce5b am ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo 
Merge commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a' into froyo-plus-aosp

* commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a':
  Don't bring up Launcher until after boot complete
 2010-06-07 18:49:07 -07:00
Christopher Tate
e1855846a4 Merge "Don't bring up Launcher until after boot complete" into froyo 2010-06-07 18:46:46 -07:00
Dianne Hackborn
2484ce43dd am d1d9047d: Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo 
Merge commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff' into froyo-plus-aosp

* commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff':
  Fix issue #2749322: addPackageToPreferred throws SecurityException
 2010-06-07 18:32:41 -07:00
Dianne Hackborn
73f8edb0d6 Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo 2010-06-07 17:32:02 -07:00
Robert Greenwalt
c2d073a78e am 5a671d03: Cut logging, boost efficiency of ThrottleService 
Merge commit '5a671d03e3abe522a761a43b0460f9f3816b14ed' into froyo-plus-aosp

* commit '5a671d03e3abe522a761a43b0460f9f3816b14ed':
  Cut logging, boost efficiency of ThrottleService
 2010-06-07 16:59:23 -07:00
The Android Open Source Project
33f7b83776 merge from open-source master 
Change-Id: I1a36964a723bce72139f1bc2402520b7f8d5e47b
 2010-06-07 16:37:22 -07:00
The Android Open Source Project
e475488b11 merge from open-source master 
Change-Id: I56de40bad4be52a06300bfc310e16d27b2fb14df
 2010-06-07 16:32:53 -07:00
Jean-Baptiste Queru
a0abbe38b9 Merge "Canvas.drawVertices: correct color range-check" 2010-06-07 14:51:42 -07:00
Christopher Tate
076c8394fa am df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo 
Merge commit 'df2e2eff9446c0220515fa7aab7857135e04e12e' into froyo-plus-aosp

* commit 'df2e2eff9446c0220515fa7aab7857135e04e12e':
  Watchdog now records kernel stacks when it fires
 2010-06-04 18:07:07 -07:00
Christopher Tate
7188d6887e Merge "Watchdog now records kernel stacks when it fires" into froyo 2010-06-04 18:06:07 -07:00
Dianne Hackborn
f896be96c9 am 5474902f: Merge "xhdpi" into froyo 
Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into froyo-plus-aosp

* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
  xhdpi
 2010-06-04 16:33:48 -07:00
Dianne Hackborn
28b9f6e900 Merge "xhdpi" into froyo 2010-06-04 16:32:01 -07:00
Robert Greenwalt
227232f703 am f9610b38: Merge "Make the DUN apn data secure." into froyo 
Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into froyo-plus-aosp

* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
  Make the DUN apn data secure.
 2010-06-04 15:57:21 -07:00
Robert Greenwalt
0f3ca0faea Merge "Make the DUN apn data secure." into froyo 2010-06-04 15:55:09 -07:00
Jeff Hamilton
e0f5def3fd am 4b330921: Don\'t crash when low storage is encountered pre-boot completion. 
Merge commit '4b3309211ed6f3532b44481945a4725143d50b8a' into froyo-plus-aosp

* commit '4b3309211ed6f3532b44481945a4725143d50b8a':
  Don't crash when low storage is encountered pre-boot completion.
 2010-06-04 13:50:31 -07:00
The Android Open Source Project
dc544d2168 merge from open-source master 
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
 2010-06-04 11:08:36 -07:00