Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,903 Commits 3 Branches 0 Tags
409a57504fe6bb915d85f1091267206f7e0dfdcd
Commit Graph

16870 Commits

Author SHA1 Message Date
Dirk Dougherty
759ac9e3da am 21cbd52b: am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk 
Merge commit '21cbd52b7acb8f3fbcbd256a62f27f1476e9c89e' into eclair-mr2-plus-aosp

* commit '21cbd52b7acb8f3fbcbd256a62f27f1476e9c89e':
  doc change: misc doc fixes.
 2009-11-02 18:29:52 -08:00
Dirk Dougherty
f93cf36964 am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk 
Merge commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4' into eclair-plus-aosp

* commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4':
  doc change: misc doc fixes.
 2009-11-02 18:27:55 -08:00
Dirk Dougherty
21cbd52b7a am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk 
Merge commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4' into eclair-mr2

* commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4':
  doc change: misc doc fixes.
 2009-11-02 18:24:29 -08:00
Dirk Dougherty
483d29c0dd am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk 
Merge commit '671c61d66f8d556f206d167d0f3c3bbe037ed86b' into eclair

* commit '671c61d66f8d556f206d167d0f3c3bbe037ed86b':
  doc change: misc doc fixes.
 2009-11-02 18:17:26 -08:00
Jaikumar Ganesh
2cc3693d43 am a229ceda: Merge change I73d6c0f8 into eclair 
Merge commit 'a229cedadd6c3b8ab7f2d8b7b45638753e834992' into eclair-plus-aosp

* commit 'a229cedadd6c3b8ab7f2d8b7b45638753e834992':
  Add ability to disable sending Photos using Vcard. Do Not Merge
 2009-11-02 15:54:33 -08:00
Android (Google) Code Review
a229cedadd Merge change I73d6c0f8 into eclair 
* changes:
  Add ability to disable sending Photos using Vcard. Do Not Merge
 2009-11-02 18:46:04 -05:00
Dianne Hackborn
22a90c1915 am 50bb2643: am d62b063f: am b6a6791f: Merge change I60413727 into eclair 
Merge commit '50bb2643a5cb28c4e013eceb15c23288c85e0350'

* commit '50bb2643a5cb28c4e013eceb15c23288c85e0350':
  Fix issue #2226370: Resource versions match with equality
 2009-11-02 11:13:43 -08:00
Dianne Hackborn
50bb2643a5 am d62b063f: am b6a6791f: Merge change I60413727 into eclair 
Merge commit 'd62b063fd4ac0ae1419348ac62c55527cb398fd9' into eclair-mr2-plus-aosp

* commit 'd62b063fd4ac0ae1419348ac62c55527cb398fd9':
  Fix issue #2226370: Resource versions match with equality
 2009-11-02 11:04:56 -08:00
Dianne Hackborn
efb752570e am b6a6791f: Merge change I60413727 into eclair 
Merge commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f' into eclair-plus-aosp

* commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f':
  Fix issue #2226370: Resource versions match with equality
 2009-11-02 10:52:30 -08:00
Dianne Hackborn
d62b063fd4 am b6a6791f: Merge change I60413727 into eclair 
Merge commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f' into eclair-mr2

* commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f':
  Fix issue #2226370: Resource versions match with equality
 2009-11-02 10:52:22 -08:00
Android (Google) Code Review
b6a6791f38 Merge change I60413727 into eclair 
* changes:
  Fix issue #2226370: Resource versions match with equality
 2009-11-02 13:43:52 -05:00
Daisuke Miyakawa
d026204817 am 648feb77: am 3f16be20: Enable vCard tests connect both importer/exporter tests. 
Merge commit '648feb772445eeaf31fcee6a020e43645411c534'

* commit '648feb772445eeaf31fcee6a020e43645411c534':
  Enable vCard tests connect both importer/exporter tests.
 2009-11-01 22:45:52 -08:00
Daisuke Miyakawa
648feb7724 am 3f16be20: Enable vCard tests connect both importer/exporter tests. 
Merge commit '3f16be2061ddf8daeed959c6e06db9cf561ae304' into eclair-mr2-plus-aosp

* commit '3f16be2061ddf8daeed959c6e06db9cf561ae304':
  Enable vCard tests connect both importer/exporter tests.
 2009-11-01 22:36:02 -08:00
Daisuke Miyakawa
3f16be2061 Enable vCard tests connect both importer/exporter tests. 
Fix a bug in ContactStruct.

Internal issue number: 2195990
 2009-11-02 15:25:23 +09:00
Mike LeBeau
c9e8d30e6a am 0d8aa05d: am b5868caa: am d3e4dab9: Merge change I7df84618 into eclair 
Merge commit '0d8aa05d306205850e3014550bce34735ac78660'

* commit '0d8aa05d306205850e3014550bce34735ac78660':
  Add a privateImeOption to represent that the IME should not show
 2009-11-01 21:56:43 -08:00
Jack Wang
a64f95639f am af93c05c: am 227ba207: am e8228afb: Merge change I92cdc5ed into eclair 
Merge commit 'af93c05c9a25018daf375094c8e697b83795b2d4'

* commit 'af93c05c9a25018daf375094c8e697b83795b2d4':
  PerformanceCollector: Collect & report perf measurements in key/value form
 2009-11-01 21:56:33 -08:00
Mike Reed
514ee74db4 am 2cacabae: am 58d30b69: am 1864d01f: Merge change Iae849da2 into eclair 
Merge commit '2cacabaea9beabb0019b38a4734c1297ffeff607'

* commit '2cacabaea9beabb0019b38a4734c1297ffeff607':
  add table maskfilter
 2009-11-01 21:54:17 -08:00
Jaikumar Ganesh
16dc9b5174 am e0d30d67: am bf2efbc0: am 3cf254d2: Merge change I4b3db907 into eclair 
Merge commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8'

* commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8':
  Revert the channge where channels were not selected randomly.
 2009-11-01 21:50:19 -08:00
Dianne Hackborn
553399518f Fix issue #2226370: Resource versions match with equality 
Also fixed turned-around increment of version number for resources. :(

Change-Id: I604137272da984bcd69cee4f174e6b7f2c786e46
 2009-11-01 21:16:59 -08:00
Dirk Dougherty
6b13bc043e doc change: misc doc fixes. 
Bug:2160782
Change-Id: Iaf5d2cc2e3c657700469e8b7394a95bc03fc26f3
 2009-10-30 19:44:22 -07:00
Mike LeBeau
0d8aa05d30 am b5868caa: am d3e4dab9: Merge change I7df84618 into eclair 
Merge commit 'b5868caa8cfe4b3fb14c04f64a71c20a172faaef' into eclair-mr2-plus-aosp

* commit 'b5868caa8cfe4b3fb14c04f64a71c20a172faaef':
  Add a privateImeOption to represent that the IME should not show
 2009-10-30 18:41:16 -07:00
Jack Wang
af93c05c9a am 227ba207: am e8228afb: Merge change I92cdc5ed into eclair 
Merge commit '227ba2072df1474a0b3abaae7c415f152d32bcc2' into eclair-mr2-plus-aosp

* commit '227ba2072df1474a0b3abaae7c415f152d32bcc2':
  PerformanceCollector: Collect & report perf measurements in key/value form
 2009-10-30 18:41:08 -07:00
Mike LeBeau
b5868caa8c am d3e4dab9: Merge change I7df84618 into eclair 
Merge commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a' into eclair-mr2

* commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a':
  Add a privateImeOption to represent that the IME should not show
 2009-10-30 18:22:00 -07:00
Mike LeBeau
b09123255e am d3e4dab9: Merge change I7df84618 into eclair 
Merge commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a' into eclair-plus-aosp

* commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a':
  Add a privateImeOption to represent that the IME should not show
 2009-10-30 18:21:18 -07:00
Android (Google) Code Review
d3e4dab962 Merge change I7df84618 into eclair 
* changes:
  Add a privateImeOption to represent that the IME should not show the voice input microphone, if it otherwise would, whenever the search dialog is planning on showing a voice search button (as specified by the current searchable).
 2009-10-30 21:12:00 -04:00
Jack Wang
227ba2072d am e8228afb: Merge change I92cdc5ed into eclair 
Merge commit 'e8228afb2bd005ae25ce58719f9d678389b26a16' into eclair-mr2

* commit 'e8228afb2bd005ae25ce58719f9d678389b26a16':
  PerformanceCollector: Collect & report perf measurements in key/value form
 2009-10-30 17:07:56 -07:00
Jack Wang
1d225d67d9 am e8228afb: Merge change I92cdc5ed into eclair 
Merge commit 'e8228afb2bd005ae25ce58719f9d678389b26a16' into eclair-plus-aosp

* commit 'e8228afb2bd005ae25ce58719f9d678389b26a16':
  PerformanceCollector: Collect & report perf measurements in key/value form
 2009-10-30 17:07:21 -07:00
Android (Google) Code Review
e8228afb2b Merge change I92cdc5ed into eclair 
* changes:
  PerformanceCollector: Collect & report perf measurements in key/value form
 2009-10-30 20:02:13 -04:00
Mike LeBeau
7df846186d Add a privateImeOption to represent that the IME should not show 
the voice input microphone, if it otherwise would, whenever the
search dialog is planning on showing a voice search button (as
specified by the current searchable).

The IME will respect this shortly.

http://b/2228562
 2009-10-30 16:11:40 -07:00
Jaikumar Ganesh
73d6c0f81f Add ability to disable sending Photos using Vcard. Do Not Merge 
This to fix PBAP support for some car kits which are unable
to handle contacts with photos.
Original Change by: Yue Lixin

Bug: 2183320
Dr No: Eastham
 2009-10-30 15:28:27 -07:00
Mike Reed
2cacabaea9 am 58d30b69: am 1864d01f: Merge change Iae849da2 into eclair 
Merge commit '58d30b69071363aba38307bc5ee3b2d81f22f09d' into eclair-mr2-plus-aosp

* commit '58d30b69071363aba38307bc5ee3b2d81f22f09d':
  add table maskfilter
 2009-10-30 14:23:31 -07:00
Mike Reed
9b1e9d8e79 am 1864d01f: Merge change Iae849da2 into eclair 
Merge commit '1864d01f2be0e82da7d8844fa91bee8880282041' into eclair-plus-aosp

* commit '1864d01f2be0e82da7d8844fa91bee8880282041':
  add table maskfilter
 2009-10-30 14:13:53 -07:00
Mike Reed
58d30b6907 am 1864d01f: Merge change Iae849da2 into eclair 
Merge commit '1864d01f2be0e82da7d8844fa91bee8880282041' into eclair-mr2

* commit '1864d01f2be0e82da7d8844fa91bee8880282041':
  add table maskfilter
 2009-10-30 14:13:44 -07:00
Android (Google) Code Review
1864d01f2b Merge change Iae849da2 into eclair 
* changes:
  add table maskfilter
 2009-10-30 17:03:18 -04:00
Jaikumar Ganesh
e0d30d674d am bf2efbc0: am 3cf254d2: Merge change I4b3db907 into eclair 
Merge commit 'bf2efbc0642d07acee1a83c17987abb380e5243a' into eclair-mr2-plus-aosp

* commit 'bf2efbc0642d07acee1a83c17987abb380e5243a':
  Revert the channge where channels were not selected randomly.
 2009-10-30 10:37:46 -07:00
Jaikumar Ganesh
97b41f0da9 am 3cf254d2: Merge change I4b3db907 into eclair 
Merge commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f' into eclair-plus-aosp

* commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f':
  Revert the channge where channels were not selected randomly.
 2009-10-30 10:33:52 -07:00
Jaikumar Ganesh
bf2efbc064 am 3cf254d2: Merge change I4b3db907 into eclair 
Merge commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f' into eclair-mr2

* commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f':
  Revert the channge where channels were not selected randomly.
 2009-10-30 10:31:25 -07:00
Android (Google) Code Review
3cf254d2ba Merge change I4b3db907 into eclair 
* changes:
  Revert the channge where channels were not selected randomly.
 2009-10-30 13:23:43 -04:00
Jaikumar Ganesh
4b3db907f0 Revert the channge where channels were not selected randomly. 
The Bluez SDP bug has been fixed.
Reverting parts of the commit: 16fb88a673

Bug: 2173752
Dr No: Eastham
 2009-10-30 09:37:25 -07:00
Mike Reed
0e1e623011 add table maskfilter 
hidden for now, since it need only be seen by Launcher2

http://b/issue?id=2210685
 2009-10-30 08:11:58 -04:00
Jeff Sharkey
e55b5e4fd3 am 46e0cccd: am 5546e9e6: am 824838d7: Avoid NPE when callers send null selection args. 
Merge commit '46e0cccd619aecd4d88410b8cdf420a9247e3fbd'

* commit '46e0cccd619aecd4d88410b8cdf420a9247e3fbd':
  Avoid NPE when callers send null selection args.
 2009-10-29 20:20:01 -07:00
Fred Quintana
a421cda5a1 am c7749e4b: am 6b995479: am fae288c7: Merge change I9efe265f into eclair 
Merge commit 'c7749e4bf724e26a9be530b3baef2441533490f7'

* commit 'c7749e4bf724e26a9be530b3baef2441533490f7':
  unhide AccountManagerResponse
 2009-10-29 20:19:07 -07:00
Ed Heyl
346179f6ff am ccb2e1ea: am 7fb4e4aa: am 154d61fc: Merge change Id6f158b3 into eclair 
Merge commit 'ccb2e1eada05fefed0c1f9f6d4fca45d307c2bfd'

* commit 'ccb2e1eada05fefed0c1f9f6d4fca45d307c2bfd':
  Removed javadoc link to hidden class (temporary fix for build)
 2009-10-29 20:18:50 -07:00
San Mehat
351621907a am 9d91da02: am 67ef832c: am 957e5867: process: Disable debugging 
Merge commit '9d91da02d9dd83caad87279002a67780a2480623'

* commit '9d91da02d9dd83caad87279002a67780a2480623':
  process: Disable debugging
 2009-10-29 20:18:32 -07:00
Costin Manolache
a211aa60e9 am 770dc6e5: am 492dbe17: am 4388b988: Merge change Idc4c7714 into eclair 
Merge commit '770dc6e5890c70af2b176770539d4afd4e904ff5'

* commit '770dc6e5890c70af2b176770539d4afd4e904ff5':
  Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
 2009-10-29 20:17:54 -07:00
Jeff Hamilton
9c182f191e am 095f3411: am cd79e5e1: am b5c05516: Merge change I3b7d5cbe into eclair 
Merge commit '095f3411a1a032847bffe2e21f57e1f27cc8a64e'

* commit '095f3411a1a032847bffe2e21f57e1f27cc8a64e':
  Copy the selection args when creating a CPO since callers often reuse the passed in array.
 2009-10-29 20:17:16 -07:00
San Mehat
3e883fb1c8 am 3e28a104: am 574b99bf: am 8e312e81: Merge change Ia5109a87 into eclair 
Merge commit '3e28a1047975d46a2754bb3092344686d3733cfe'

* commit '3e28a1047975d46a2754bb3092344686d3733cfe':
  process: Add debug code to log process group transitions
 2009-10-29 20:16:49 -07:00
Jack Palevich
599d0fe5a2 am 9009d51f: am 5be6eedf: am b575e4df: Merge change I4a943184 into eclair 
Merge commit '9009d51f258efaf092c1a3dc367dd2ec320c50ea'

* commit '9009d51f258efaf092c1a3dc367dd2ec320c50ea':
  Avoid trying to throw multiple exceptions at once.
 2009-10-29 20:16:29 -07:00
Suchi Amalapurapu
be0647c70c am df4bc1d1: am a7bbedca: am 22dad592: Merge change I6cae32c7 into eclair 
Merge commit 'df4bc1d1d508a6482fa9985d415e3e3afc114a28'

* commit 'df4bc1d1d508a6482fa9985d415e3e3afc114a28':
  When upgrading packages with shared user ids make sure we are eliminating
 2009-10-29 20:16:07 -07:00
Jeff Sharkey
46e0cccd61 am 5546e9e6: am 824838d7: Avoid NPE when callers send null selection args. 
Merge commit '5546e9e6721a5b05678ea6ceb3be433219f53fe6' into eclair-mr2-plus-aosp

* commit '5546e9e6721a5b05678ea6ceb3be433219f53fe6':
  Avoid NPE when callers send null selection args.
 2009-10-29 19:59:50 -07:00