ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity
4,276 Commits 2 Branches 0 Tags 54 MiB
5e4c678cfc
Commit Graph

4276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chung-yih Wang
5e4c678cfc am 9c64d590: Merge change 23425 into eclair 
Merge commit '9c64d59027a09699ec5ef1f0fedd88910ee7ae27' into eclair-plus-aosp

* commit '9c64d59027a09699ec5ef1f0fedd88910ee7ae27':
  Store CA certificate chain into one single key entry with PEM format.
 2009-09-02 00:15:33 -07:00
Android (Google) Code Review
7977859eae Merge change 23425 into eclair 
* changes:
  Store CA certificate chain into one single key entry with PEM format.
 2009-09-01 23:23:41 -07:00
Wu-cheng Li
44c9e84055 am 9b6a8ab8: Add camera parameters constants and methods. 
Merge commit '9b6a8ab8221f2df20c32711b0f1e4f301165fac2' into eclair-plus-aosp

* commit '9b6a8ab8221f2df20c32711b0f1e4f301165fac2':
  Add camera parameters constants and methods.
 2009-09-01 22:01:00 -07:00
Christopher Tate
d248b2a242 am 9756a70b: Merge change 23582 into eclair 
Merge commit '9756a70bd92fb844d2fd8346cc4bb6c8bb768c4b' into eclair-plus-aosp

* commit '9756a70bd92fb844d2fd8346cc4bb6c8bb768c4b':
  Expand apps' control over the settings restore process
 2009-09-01 21:02:33 -07:00
Android (Google) Code Review
02db7d0371 Merge change 23582 into eclair 
* changes:
  Expand apps' control over the settings restore process
 2009-09-01 21:00:59 -07:00
Jason Sams
bdf492ebaf am f4cca783: Merge change 23583 into eclair 
Merge commit 'f4cca783dff5335108647ff7ae86983f56245067' into eclair-plus-aosp

* commit 'f4cca783dff5335108647ff7ae86983f56245067':
  Update fountain to use structures.
 2009-09-01 20:43:58 -07:00
Android (Google) Code Review
766ba2e41d Merge change 23583 into eclair 
* changes:
  Update fountain to use structures.
 2009-09-01 20:42:19 -07:00
Jaikumar Ganesh
a7095096cb am c937b5ce: Merge change 23463 into eclair 
Merge commit 'c937b5ce4ff2f39fd9c60f718f98550a932b62f0' into eclair-plus-aosp

* commit 'c937b5ce4ff2f39fd9c60f718f98550a932b62f0':
  Wait for HCI to come up if getting the adapter path fails.
 2009-09-01 19:20:44 -07:00
Dianne Hackborn
126c98f174 am 2d2d5c43: am c804efe2: Merge change 23569 into donut 
Merge commit '2d2d5c4372b8ea5cf925c838b2149686211445af' into eclair-plus-aosp

* commit '2d2d5c4372b8ea5cf925c838b2149686211445af':
  Update 4.xml to the most recent APIs.
 2009-09-01 19:20:39 -07:00
Android (Google) Code Review
0d4ab1e3d5 Merge change 23463 into eclair 
* changes:
  Wait for HCI to come up if getting the adapter path fails.
 2009-09-01 19:19:47 -07:00
Dianne Hackborn
6fbbccc4a2 am c804efe2: Merge change 23569 into donut 
Merge commit 'c804efe278fa33555e6e836504a467cb14505eb3' into eclair

* commit 'c804efe278fa33555e6e836504a467cb14505eb3':
  Update 4.xml to the most recent APIs.
 2009-09-01 19:18:18 -07:00
Android (Google) Code Review
1f03cab9f9 Merge change 23569 into donut 
* changes:
  Update 4.xml to the most recent APIs.
 2009-09-01 19:15:59 -07:00
Dianne Hackborn
8af5cbbbb0 am ff0dc82c: am 6a98f8d9: Merge change 23499 into donut 
Merge commit 'ff0dc82c1cfe780e6f4c87d1d34de6dc3b741a2d' into eclair-plus-aosp

* commit 'ff0dc82c1cfe780e6f4c87d1d34de6dc3b741a2d':
  Fix content provider
 2009-09-01 19:14:08 -07:00
Dianne Hackborn
07a29fc9f8 am 6a98f8d9: Merge change 23499 into donut 
Merge commit '6a98f8d93e4ddd407baad8d9b7481a892001d281' into eclair

* commit '6a98f8d93e4ddd407baad8d9b7481a892001d281':
  Fix content provider
 2009-09-01 19:11:44 -07:00
Scott Main
e34a19f435 am cc22efb5: am dc516413: Merge change 23503 into donut 
Merge commit 'cc22efb52e8b5851b7d53099f7f814bfae266124' into eclair-plus-aosp

* commit 'cc22efb52e8b5851b7d53099f7f814bfae266124':
  docs only.
 2009-09-01 19:09:36 -07:00
Android (Google) Code Review
de9306e573 Merge change 23499 into donut 
* changes:
  Fix content provider
 2009-09-01 19:09:24 -07:00
Scott Main
8782fa2205 am dc516413: Merge change 23503 into donut 
Merge commit 'dc5164134c507f747f1cf89c01e4fb5e724eccd4' into eclair

* commit 'dc5164134c507f747f1cf89c01e4fb5e724eccd4':
  docs only.
 2009-09-01 19:07:10 -07:00
Android (Google) Code Review
245e5ecd6a Merge change 23503 into donut 
* changes:
  docs only. expand the uses-feature docs
 2009-09-01 19:04:15 -07:00
Scott Main
08c96ae24e am 4e0951c9: am 4e60d012: docs only. add syntax samples for all attributes and revise targetSdkVersion information. 
Merge commit '4e0951c9f31c5b5a6026552ede3f47aa038b525e' into eclair-plus-aosp

* commit '4e0951c9f31c5b5a6026552ede3f47aa038b525e':
  docs only.
 2009-09-01 18:49:52 -07:00
Scott Main
0478d2b74c am 4e60d012: docs only. add syntax samples for all attributes and revise targetSdkVersion information. 
Merge commit '4e60d012c95f50ddd2a1ba6202e4fec3c9cfd3df' into eclair

* commit '4e60d012c95f50ddd2a1ba6202e4fec3c9cfd3df':
  docs only.
 2009-09-01 18:48:34 -07:00
Fred Quintana
f22d5c327f am 04f6da35: Merge change 23376 into eclair 
Merge commit '04f6da353d4e79f49ba1d4897ed617e91acc3f77' into eclair-plus-aosp

* commit '04f6da353d4e79f49ba1d4897ed617e91acc3f77':
  - don't schedule syncs that we will never dispatch
 2009-09-01 17:40:49 -07:00
Android (Google) Code Review
1a863c2f3e Merge change 23376 into eclair 
* changes:
  - don't schedule syncs that we will never dispatch - expedite the INITIALIZATION sync
 2009-09-01 17:38:25 -07:00
Jean-Michel Trivi
adc1da20fb am b1461fb4: Merge change 23542 into eclair 
Merge commit 'b1461fb4824f872faff40b206383d5e0faeda2ea' into eclair-plus-aosp

* commit 'b1461fb4824f872faff40b206383d5e0faeda2ea':
  Modify the gain after filtering to prevent TTS clipping in en-US.
 2009-09-01 16:21:09 -07:00
Android (Google) Code Review
104e15eac2 Merge change 23542 into eclair 
* changes:
  Modify the gain after filtering to prevent TTS clipping in en-US.
 2009-09-01 16:19:14 -07:00
Wink Saville
05d195498c am 65d62c77: Add hasIccCard to IccCard and TelephonyManager. 
Merge commit '65d62c774e42d8bf9a55ef50e153ffc9e277ef37' into eclair-plus-aosp

* commit '65d62c774e42d8bf9a55ef50e153ffc9e277ef37':
  Add hasIccCard to IccCard and TelephonyManager.
 2009-09-01 15:58:10 -07:00
San Mehat
a60840e3f2 am 03a3327b: Merge change 23506 into eclair 
Merge commit '03a3327badda54728de2ca969b31b53f5ad9ad3a' into eclair-plus-aosp

* commit '03a3327badda54728de2ca969b31b53f5ad9ad3a':
  dumpstate: Add support for apanic crash data
 2009-09-01 15:42:30 -07:00
Android (Google) Code Review
f44bbdea0b Merge change 23506 into eclair 
* changes:
  dumpstate: Add support for apanic crash data
 2009-09-01 15:40:28 -07:00
Tom Taylor
88eed292da am 513069c3: Make a path constant 
Merge commit '513069c39cd6610db2919c09abea2ff73158356a' into eclair-plus-aosp

* commit '513069c39cd6610db2919c09abea2ff73158356a':
  Make a path constant
 2009-09-01 15:30:34 -07:00
Grace Kloba
f3f45a4b74 am 9217c458: When we destroy a WebView, RESUME_TIMERS/PAUSE_TIMERS may be still in the queue. We need to pass them to WebViewCore as they are per process base. If we drop them, the counter in the JWebCoreJavaBridge can be out of order. 
Merge commit '9217c45829da4d0c9c9dbdc6bc950c7f3e03e4f5' into eclair-plus-aosp

* commit '9217c45829da4d0c9c9dbdc6bc950c7f3e03e4f5':
  When we destroy a WebView, RESUME_TIMERS/PAUSE_TIMERS may be still in the queue.
 2009-09-01 15:02:34 -07:00
Lixin Yue
dee27e53d2 am 485e6dca: Merge change 23462 into eclair 
Merge commit '485e6dca960c2001349de0817c644f24ae85c6e3' into eclair-plus-aosp

* commit '485e6dca960c2001349de0817c644f24ae85c6e3':
  Add Bluetooth Device trust
 2009-09-01 14:11:53 -07:00
Android (Google) Code Review
6a25ac6e54 Merge change 23462 into eclair 
* changes:
  Add Bluetooth Device trust
 2009-09-01 14:10:06 -07:00
jsh
80c85deddb am a01726a7: Some fixes to SMS processing in the framework. 
Merge commit 'a01726a7fdd872cd8e1e8a9dfa52fb9cdbf01019' into eclair-plus-aosp

* commit 'a01726a7fdd872cd8e1e8a9dfa52fb9cdbf01019':
  Some fixes to SMS processing in the framework.
 2009-09-01 13:40:15 -07:00
Evan Millar
90b7d5009b am 394c92ef: Merge change 23461 into eclair 
Merge commit '394c92ef154e04fe37ac4688fc6b9cc13917db1f' into eclair-plus-aosp

* commit '394c92ef154e04fe37ac4688fc6b9cc13917db1f':
  Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider
 2009-09-01 13:10:35 -07:00
Android (Google) Code Review
c8993dc828 Merge change 23461 into eclair 
* changes:
  Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider
 2009-09-01 13:09:25 -07:00
Dmitri Plotnikov
004bbafea9 am 6ff270fd: Merge change 23474 into eclair 
Merge commit '6ff270fd854d7c62f857998446fccb803004f1c3' into eclair-plus-aosp

* commit '6ff270fd854d7c62f857998446fccb803004f1c3':
  Breaking sleep after yield into small quanta.
 2009-09-01 13:06:04 -07:00
Android (Google) Code Review
bf6bef8982 Merge change 23474 into eclair 
* changes:
  Breaking sleep after yield into small quanta.
 2009-09-01 13:03:58 -07:00
Dianne Hackborn
cd22fcfb71 am d31825c6: Merge change 23403 into eclair 
Merge commit 'd31825c6ff83a3e336efc97ced1b205fe65b11a9' into eclair-plus-aosp

* commit 'd31825c6ff83a3e336efc97ced1b205fe65b11a9':
  Various infrastructure to support a running services UI.
 2009-09-01 12:33:07 -07:00
Android (Google) Code Review
acdf24d076 Merge change 23403 into eclair 
* changes:
  Various infrastructure to support a running services UI.
 2009-09-01 12:31:31 -07:00
Guang Zhu
0d6049ab38 am 87b455f5: Merge change 23469 into eclair 
Merge commit '87b455f5581b3cc3edb9003592a11a1a43104109' into eclair-plus-aosp

* commit '87b455f5581b3cc3edb9003592a11a1a43104109':
  Set a default dump type for DRT as a workaround for indeterministic order in receiving dumpAsText and onPageFinish callback.
 2009-09-01 12:05:47 -07:00
Android (Google) Code Review
cb01fd10ff Merge change 23469 into eclair 
* changes:
  Set a default dump type for DRT as a workaround for indeterministic order in receiving dumpAsText and onPageFinish callback.
 2009-09-01 12:03:39 -07:00
Daniel Sandler
96ec9e31ee am 0c91f5a3: Merge change 23464 into eclair 
Merge commit '0c91f5a3b20fea1c937212c2aeec073128f6fdc3' into eclair-plus-aosp

* commit '0c91f5a3b20fea1c937212c2aeec073128f6fdc3':
  Create new hdpi versions of 1x data statusbar icons.
 2009-09-01 11:51:53 -07:00
Android (Google) Code Review
28fc36b59b Merge change 23464 into eclair 
* changes:
  Create new hdpi versions of 1x data statusbar icons.
 2009-09-01 11:49:45 -07:00
Jean-Baptiste Queru
3f155e9686 merge from open-source master 2009-09-01 11:46:14 -07:00
Eric Fischer
c5ff11ecd5 am b7559e02: am 56205fea: Merge change 23345 into donut 
Merge commit 'b7559e02803266e5fa9f4496174bc343ecd245ab' into eclair-plus-aosp

* commit 'b7559e02803266e5fa9f4496174bc343ecd245ab':
  Fix an emoji-measuring bug that caused an exception when editing a contact.
 2009-09-01 11:20:35 -07:00
Eric Fischer
4ce160e5e7 am 56205fea: Merge change 23345 into donut 
Merge commit '56205fea879543a50bb797016832416a8b48cabb' into eclair

* commit '56205fea879543a50bb797016832416a8b48cabb':
  Fix an emoji-measuring bug that caused an exception when editing a contact.
 2009-09-01 11:18:43 -07:00
Android (Google) Code Review
7a758262de Merge change 23345 into donut 
* changes:
  Fix an emoji-measuring bug that caused an exception when editing a contact.
 2009-09-01 11:16:25 -07:00
Eric Laurent
45ecde990e am 46c15823: Merge change 23105 into eclair 
Merge commit '46c158234dee0d1d47f06b7661150c18512dc589' into eclair-plus-aosp

* commit '46c158234dee0d1d47f06b7661150c18512dc589':
  Fix issue 2077333: The volume key will effect both ring and media vol at the same time.
 2009-09-01 11:15:42 -07:00
Android (Google) Code Review
7ce2a71d9f Merge change 23105 into eclair 
* changes:
  Fix issue 2077333: The volume key will effect both ring and media vol at the same time.
 2009-09-01 11:14:00 -07:00
Guang Zhu
040e69d4d5 am d9942b5c: Merge change 23450 into eclair 
Merge commit 'd9942b5cb1662638bb6fb57c12a06976e3c34651' into eclair-plus-aosp

* commit 'd9942b5cb1662638bb6fb57c12a06976e3c34651':
  At leaset log the layout test timeouts
 2009-09-01 10:27:23 -07:00
Android (Google) Code Review
0e1151b073 Merge change 23450 into eclair 
* changes:
  At leaset log the layout test timeouts
 2009-09-01 10:24:38 -07:00