29694 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
4b94c451d2 Merge "Added dropbox broadcast notification" 2010-12-13 12:34:48 -08:00
Martijn Coenen
6c2471649b am e3f6336b: Fixed API for active NDEF reading and NDEF formatting.
* commit 'e3f6336bcffc250da90ec864bccfa73ad1d016b9':
  Fixed API for active NDEF reading and NDEF formatting.
2010-12-13 08:14:01 -08:00
Martijn Coenen
e3f6336bcf Fixed API for active NDEF reading and NDEF formatting.
- Added getNdefCached() to return the message read at discovery time.
- Fixed format() to check ndef before doing the write:
  libnfc actually requires a checkNdef to be done before writing.

Change-Id: I9b3108299c05539bdef92dd74f62f911fb5a16bf
2010-12-13 09:58:58 -06:00
Jeff Hamilton
80c78a896f am 641dd621: First pass at advanced NFC tag dispatching APIs and other cleanup.
* commit '641dd62155fd2eeddd93b2036154b13c05b70ba2':
  First pass at advanced NFC tag dispatching APIs and other cleanup.
2010-12-11 20:58:38 -08:00
Jeff Hamilton
641dd62155 First pass at advanced NFC tag dispatching APIs and other cleanup.
Change-Id: I022fcd481274a2f68d93218026e77551cfae8cae
2010-12-10 22:48:16 -06:00
Martijn Coenen
41e74b991b am b79173f6: Changed technology close() to reconnect to the tag instead of physical disconnect.
* commit 'b79173f6602359d00a1a89f4d6505a44d461d796':
  Changed technology close() to reconnect to the tag instead of physical disconnect.
2010-12-10 20:40:40 -08:00
Martijn Coenen
2019f53396 am fc5a3b6c: Changed transceive on all technologies to "raw", except for Mifare classes.
* commit 'fc5a3b6cfb85679e82a39730c7154b55b0711a0c':
  Changed transceive on all technologies to "raw", except for Mifare classes.
2010-12-10 20:40:34 -08:00
Martijn Coenen
25556f6669 am 3300e4c3: Implemented isWritable() to indicate NDEF capability container r/w state.
* commit '3300e4c3ea2f2317532ded6f9e79d6ad9e038679':
  Implemented isWritable() to indicate NDEF capability container r/w state.
2010-12-10 20:40:26 -08:00
Martijn Coenen
b79173f660 Changed technology close() to reconnect to the tag instead of physical disconnect.
Change-Id: I8935e4aae452adeec472c0b3ff3c77f1400a264e
2010-12-10 22:07:46 -06:00
Martijn Coenen
fc5a3b6cfb Changed transceive on all technologies to "raw", except for Mifare classes.
Change-Id: I3d680e37fec0ab84cdbb70d9fb6fff9527dd76a2
2010-12-10 22:06:35 -06:00
Martijn Coenen
3300e4c3ea Implemented isWritable() to indicate NDEF capability container r/w state.
Change-Id: Ie8bdf490c955e620f5e5029346fbe2e188ea4748
2010-12-10 22:02:09 -06:00
Nick Pelly
1d0d1188d7 am ae56a851: Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread
* commit 'ae56a851624c2b2e78da8a2c339d2caa64c4f981':
  Make getSystemService(NFC_SERVICE) the NFC entry point.
2010-12-10 17:19:45 -08:00
Nick Pelly
ae56a85162 Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread 2010-12-10 17:18:00 -08:00
Nick Pelly
50b4d8f643 Make getSystemService(NFC_SERVICE) the NFC entry point.
This gives NFC service a handle to the application context.

Deprecate NfcAdapter.getDefaultAdapter(), it does not provide a context.
Using this method will print a warning, and will later throw an exception
if a method that requires a context is called. No 2.3 API's will fail, but
new API's that do require a context might fail.

Also add helper NfcAdapter.getDefaultAdapter(Context).

Change-Id: I9a6378de4ef4b61ad922f8d53e64e2a1a1d5d60c
2010-12-10 17:12:33 -08:00
Megha Joshi
87c03b58a9 am 7a1f15b1: Merge "Integrating webinar hosting with developer.android.com" into gingerbread
* commit '7a1f15b1497ba2a79243448f6ac5617264f8c8d3':
  Integrating webinar hosting with developer.android.com
2010-12-10 12:33:59 -08:00
Megha Joshi
7a1f15b149 Merge "Integrating webinar hosting with developer.android.com" into gingerbread 2010-12-10 12:30:35 -08:00
Eric Fischer
af22f4f16d am 767926bb: Import revised translations. DO NOT MERGE
* commit '767926bbe90358bc3857f4b78f54c8cdacfb8773':
  Import revised translations.  DO NOT MERGE
2010-12-10 10:03:55 -08:00
Jean-Baptiste Queru
81266d9936 am a218e014: reconcile with open-source gingerbread
* commit 'a218e01437c3c47c49ced7ab363bf98fe92cf1e3':
2010-12-10 08:49:37 -08:00
Eric Fischer
767926bbe9 Import revised translations. DO NOT MERGE
Bug 3272618

Change-Id: I165a5964e62e3d3df59c26cf6595898ea3f84996
2010-12-09 16:54:24 -08:00
Costin Manolache
5d275bba42 Fix bug in permission grant system.
Change-Id: Ic7d712e5a672c3eded16fee83235db01ab3c74fa
2010-12-09 16:53:33 -08:00
Wink Saville
a740413022 am d0ffef4b: am 19b23afa: Merge "Fix for phone app crash in Icc Card."
* commit 'd0ffef4b43594e540cb867da18d4403b4f583622':
  Fix for phone app crash in Icc Card.
2010-12-09 14:02:09 -08:00
Wink Saville
d0ffef4b43 am 19b23afa: Merge "Fix for phone app crash in Icc Card."
* commit '19b23afadf1053a8e06cb3444d9cdae3405ad9a1':
  Fix for phone app crash in Icc Card.
2010-12-09 13:58:26 -08:00
Wink Saville
19b23afadf Merge "Fix for phone app crash in Icc Card." 2010-12-09 13:50:28 -08:00
Megha Joshi
cc0c9daa91 Integrating webinar hosting with developer.android.com
Change-Id: I320378560bbb09efade14f583dbcf2d66f34a9d8
2010-12-09 11:42:12 -08:00
Jean-Baptiste Queru
1bec55bd24 am d9c17cc1: merge from gingerbread
* commit 'd9c17cc1178bc09d30eead05bf5be7ec5a05cbe7':
  Add more checks for bad values to protect from corrupt files.
  Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
2010-12-09 10:45:29 -08:00
Jean-Baptiste Queru
a218e01437 reconcile with open-source gingerbread
Change-Id: I11029c58c7bcfa194dde5584ea1e3ba048fb817b
2010-12-09 10:18:23 -08:00
Jean-Baptiste Queru
d9c17cc117 merge from gingerbread
Change-Id: I12d6ef65986db41e658bf8d476a8e18c4dd89917
2010-12-09 09:11:06 -08:00
Dianne Hackborn
e59e0309a1 Add more checks for bad values to protect from corrupt files.
Change-Id: I5e282099e7c6fcc8756146fc7282eec31937af1f
2010-12-09 07:49:05 -08:00
Kenny Root
63be7a732e Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
Be compatible with the old DownloadProvider behavior of being able to
operate on content URIs returned from .insert()

Bug: 3242328
Change-Id: Ibd2ed553c87ea694d4b09a8265c7131fae588719
2010-12-09 07:48:55 -08:00
Wink Saville
cc41b92ed7 am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
* commit '0a5ae453e50144b31c7f544714feb5bbc7b77d18':
  frameworks/base/telephony: Release wakelock on RIL request send error
2010-12-08 21:57:03 -08:00
Wink Saville
0a5ae453e5 am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
* commit '7f7474ddd6170b68b8b58cc03b75df85c96f08f2':
  frameworks/base/telephony: Release wakelock on RIL request send error
2010-12-08 21:53:24 -08:00
Wink Saville
7f7474ddd6 Merge "frameworks/base/telephony: Release wakelock on RIL request send error" 2010-12-08 21:37:38 -08:00
Mathias Agopian
054ae78245 am e1752f41: Merge "fix [3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread
* commit 'e1752f41d34249c891564889b07963262b1bd8bf':
  fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
2010-12-08 16:20:23 -08:00
James Dong
c402def718 am 1f5b133a: Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread
* commit '1f5b133ae29090f1807be392874f6b7a5d92c6d4':
  When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again
2010-12-08 16:20:16 -08:00
Mathias Agopian
e1752f41d3 Merge "fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread 2010-12-08 16:17:02 -08:00
Mathias Agopian
a2c3b35587 am 74da537f: Merge "[317580] fix issue where the screen wouldn\'t be rotated properly in bypass mode" into gingerbread
* commit '74da537f80ba36c1279c04fcb85d89fc38c246a6':
  [317580] fix issue where the screen wouldn't be rotated properly in bypass mode
2010-12-08 16:15:08 -08:00
James Dong
1f5b133ae2 Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread 2010-12-08 16:14:27 -08:00
James Dong
da1b16ad41 When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again
bug - 3264094

Change-Id: I291a9b09b335d0eb4acf91f992e59fc44bc57d01
2010-12-08 15:37:14 -08:00
Mathias Agopian
791982bad9 fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
eglQueryContext(..., EGL_CONFIG_ID, ...) is dereferencing an uninitialized pointer
due to a typo.

Change-Id: I100addf3150f19cb6dfbce9987fb5239dd240878
2010-12-08 15:34:02 -08:00
Mathias Agopian
74da537f80 Merge "[317580] fix issue where the screen wouldn't be rotated properly in bypass mode" into gingerbread 2010-12-08 15:08:33 -08:00
Brad Fitzpatrick
5f8524d446 am 36af7943: Fix malformed Javadoc.
* commit '36af79434fb62c26238132eaeda2ec5e732f3c2f':
  Fix malformed Javadoc.
2010-12-08 13:23:03 -08:00
Brad Fitzpatrick
36af79434f Fix malformed Javadoc.
Change-Id: I5cfbd49272117defce5226da0f40a8392457a2e2
2010-12-08 11:31:07 -08:00
Uma Maheswari Ramalingam
cc7605ce61 Fix for phone app crash in Icc Card.
- Check for active phone in ICC handler before processing messages.

- Boundary check for gsm/cdma subscription app index
while retrieving the ICC Card App.

Change-Id: I3d54447e8d48e3482763e78eeb2a737a34cec321
2010-12-08 10:33:24 -08:00
Anshul Jain
60bb9c9a81 frameworks/base/telephony: Release wakelock on RIL request send error
Android telephony does not release the partial wakelock right away if
there is an error in sending the RIL request. The wake lock is released
only after EVENT_WAKE_LOCK_TIMEOUT occurs that prevents the phone to go
in power collpase. The change is to release the wake lock as soon as the
error in send is detected.

Also, change RIL#send not not send a request if there is no connection to
vendor RIL, as the request will always fail.

Change-Id: Ia39a4b9ac12f4064e301a65abfd26409d49babe1
2010-12-08 10:25:41 -08:00
Hakan Still
b247536aa3 Added dropbox broadcast notification
To monitor the dropbox an application have to either poll the dropbox
and keep track of all entries or observ the /data/system/dropbox
directory. The later requires that the application runs as system-user.
This commit adds that a broadcast intent is sent when something is written
to the dropbox and an application can just listen on this intent and
then reads the entry with help of the DropboxManager class.
The application have to hold the permission android.permission.READ_LOGS
to get the intent.

Change-Id: I1f77f206a243df69f4ed5306078c47f7bf6181ec
2010-12-08 13:19:33 +01:00
Nick Pelly
8abce7f56e am 40ddd4a6: Merge "Implemented getSize() to return max ndef size." into gingerbread
* commit '40ddd4a64908c0cbe4970d2ba1703f74717620a8':
  Implemented getSize() to return max ndef size.
2010-12-07 22:57:23 -08:00
Nick Pelly
40ddd4a649 Merge "Implemented getSize() to return max ndef size." into gingerbread 2010-12-07 22:55:21 -08:00
Martijn Coenen
6d9fc7e1ef Implemented getSize() to return max ndef size.
Change-Id: Ia584e8cfa51a4eaef5f03dc436c78a67296c2cae
2010-12-07 22:54:07 -08:00
Martijn Coenen
2f3ed7912e am 5289b91c: Implement ndef formatting.
* commit '5289b91c885158094988a9a7b51b3139565eb639':
  Implement ndef formatting.
2010-12-07 22:35:01 -08:00
Martijn Coenen
5289b91c88 Implement ndef formatting.
Change-Id: I6e3e3abdc304bc14d7c93a413e42bf957963e288
2010-12-07 22:30:39 -08:00