drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,613 Commits 1 Branch 0 Tags
Commit Graph

9602 Commits

Author SHA1 Message Date
Nick Pelly
623baf8edb am 29f9ee97: Merge "Need to check ndef before writing ndef." into gingerbread 
* commit '29f9ee973eefea3c68382ed38e69db1f1a396f3f':
  Need to check ndef before writing ndef.
 2010-12-20 11:29:40 -08:00
Martijn Coenen
01d159aa2c Need to check ndef before writing ndef. 
Regression due to all the (re)connect changes.

Change-Id: I637618f63518965e893a5a59db61002271666fa4
 2010-12-16 16:34:56 -08:00
Martijn Coenen
12e5c1a21e am c58c3f1a: Implement additional Mifare Ultralight convenience methods. 
* commit 'c58c3f1ae27c0c7f560bd381180397d7f6a2ebed':
  Implement additional Mifare Ultralight convenience methods.
 2010-12-16 16:04:47 -08:00
Martijn Coenen
bf76b52f05 am 0d27f999: Expose reconnect(), to allow applications to reset tag state. 
* commit '0d27f999f4b1ad51da11946800b40d2978fc6326':
  Expose reconnect(), to allow applications to reset tag state.
 2010-12-16 16:04:41 -08:00
Martijn Coenen
9dce44ffbb am 4049f9d0: Implement multi-tech connect, enfore tech exclusivity. 
* commit '4049f9d00a86f848d42d2429068496b31a6795ad':
  Implement multi-tech connect, enfore tech exclusivity.
 2010-12-16 16:04:28 -08:00
Martijn Coenen
c58c3f1ae2 Implement additional Mifare Ultralight convenience methods. 
Change-Id: I8d9dfadb5911b2d11d1ba6dcf1381decbb8386ef
 2010-12-15 16:41:38 -06:00
Martijn Coenen
0d27f999f4 Expose reconnect(), to allow applications to reset tag state. 
Change-Id: Ib5432e7f6b6aaf6ec1cb06693592cb7c6440a6f8
 2010-12-15 16:41:38 -06:00
Martijn Coenen
4049f9d00a Implement multi-tech connect, enfore tech exclusivity. 
- The NfcService now allows for connecting to a specific technology;
- The "active" parts of technology classes may not be used at the same time.

Change-Id: Ibb569f51cc6da4f3e24df9d0850c6f49a022b0c2
 2010-12-15 16:41:38 -06:00
Dianne Hackborn
b32ea25529 am 7daaa98c: Merge "Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity" into gingerbread 
* commit '7daaa98c6531373a2a742c1360f0a2795de0619f':
  Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity
 2010-12-15 12:58:54 -08:00
Dianne Hackborn
99441c45e4 Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity 
{com.android.settings/com.android.settings.applications.StorageUse}

AbsListView could call mAdapter.getItemId() if a save state happened
after the data changed but before a layout occurred.

Change-Id: Ica020971dc458dff79b56dd810733e217f4f7da6
 2010-12-15 11:02:55 -08:00
Costin Manolache
7afa161368 am a848d344: Merge "Fix bug in permission grant system." into gingerbread 
* commit 'a848d3445090e114cbfe61f1c7449122a665fba6':
  Fix bug in permission grant system.
 2010-12-14 10:14:10 -08:00
Costin Manolache
a848d34450 Merge "Fix bug in permission grant system." into gingerbread 2010-12-14 10:07:26 -08:00
Brad Fitzpatrick
2d5b11aba0 am 0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread 
* commit '0927c9026537166cec36b2f9bb8a764ef8a7c606':
  Fix StrictMode javadoc copy/paste error.
 2010-12-13 15:27:25 -08:00
Brad Fitzpatrick
0927c90265 Merge "Fix StrictMode javadoc copy/paste error." into gingerbread 2010-12-13 15:25:09 -08:00
Nick Kralevich
30ad1e576a am 9dbef975: Merge "Avoid leaking sockets." into gingerbread 
* commit '9dbef975f0f4370dfe48a0fb040e3d8d1eb91d87':
  Avoid leaking sockets.
 2010-12-13 15:05:20 -08:00
Nick Kralevich
9dbef975f0 Merge "Avoid leaking sockets." into gingerbread 2010-12-13 15:03:28 -08:00
Dianne Hackborn
78e9f4cbae am e4a59519: Fix issue #3154576: battery stats checkin should include UID -> packages+ map 
* commit 'e4a5951925f16f18dae91ed65567e96528f17fee':
  Fix issue #3154576: battery stats checkin should include UID -> packages+ map
 2010-12-13 14:37:09 -08:00
Nick Kralevich
2ed20f8768 Avoid leaking sockets. 
When a DNS lookup fails, we end up creating a datagram socket
but never properly close it.  This wastes limited valuable file
descriptors and causes CTS test failures.  Generally, we should
ensure that sockets or files are opened in a try block, and closed
in a finally block.

Bug: 3276283
Change-Id: I3432f3bc061268c7367948230f6edbdfcec55892
 2010-12-13 14:32:17 -08:00
Dianne Hackborn
e4a5951925 Fix issue #3154576: battery stats checkin should include UID -> packages+ map 
Includes some other small fixes to battery collection and a few
other things.

Output of package info looks like this:

5,0,i,uid,1000,com.android.settings
5,0,i,uid,1000,com.android.providers.subscribedfeeds
5,0,i,uid,1000,com.android.providers.settings
5,0,i,uid,1000,com.android.server.vpn
5,0,i,uid,1000,android
5,0,i,uid,1000,com.android.systemui
5,0,i,uid,1000,com.google.android.backup
5,0,i,uid,1001,com.android.phone
5,0,i,uid,1001,com.android.providers.telephony
5,0,i,uid,1022,com.android.nfc
5,0,i,uid,10021,com.google.android.location
5,0,i,uid,10021,com.google.android.syncadapters.calendar
5,0,i,uid,10021,com.google.android.gsf
5,0,i,uid,10021,com.google.android.syncadapters.contacts
5,0,i,uid,10026,com.android.providers.downloads.ui
5,0,i,uid,10026,com.android.providers.media
5,0,i,uid,10026,com.android.providers.drm
5,0,i,uid,10026,com.android.providers.downloads
5,0,i,uid,10032,com.android.launcher
5,0,i,uid,10039,com.google.android.gm
5,0,i,uid,10041,com.google.android.gallery3d
5,0,i,uid,10049,com.android.providers.calendar

Change-Id: I9e38f254eef146339113ad270f5c6e8b60fb7a1d
 2010-12-13 14:31:40 -08:00
Brad Fitzpatrick
320274c5f1 Fix StrictMode javadoc copy/paste error. 
Change-Id: Idd49111f0a1af6f331cffa0972191b2d4e25a385
 2010-12-13 14:07:39 -08:00
Jean-Baptiste Queru
6d13b146e0 am e78a0009: resolved conflicts for merge of 4b94c451 to stage-korg-master 
* commit 'e78a000955c283509ee8a21b8b7e448060ac8dd8':
  Added dropbox broadcast notification
 2010-12-13 13:10:23 -08:00
Jean-Baptiste Queru
e78a000955 resolved conflicts for merge of 4b94c451 to stage-korg-master 
Change-Id: I07b974f96ca598677e58623050e4668822e68f23
 2010-12-13 13:06:13 -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
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
Costin Manolache
5d275bba42 Fix bug in permission grant system. 
Change-Id: Ic7d712e5a672c3eded16fee83235db01ab3c74fa
 2010-12-09 16:53:33 -08:00
Jean-Baptiste Queru
d9c17cc117 merge from gingerbread 
Change-Id: I12d6ef65986db41e658bf8d476a8e18c4dd89917
 2010-12-09 09:11:06 -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
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
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
Mathias Agopian
a0f011ff49 am 05813b0e: Merge changes I244b5469,I32044e91 into gingerbread 
* commit '05813b0eb92cb1bc79607ee402f14ca1e4b43f6d':
  [3253328, 3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
  [3171580] Fix two typos related to fixed-size buffers
 2010-12-07 14:20:14 -08:00
Mathias Agopian
05813b0eb9 Merge changes I244b5469,I32044e91 into gingerbread 
* changes:
  [3253328, 3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
  [3171580] Fix two typos related to fixed-size buffers
 2010-12-07 14:18:21 -08:00
Jeff Hamilton
03dc51b1a0 am 0f74afbb: Merge "Remove Type X Tags from the top-level API." into gingerbread 
* commit '0f74afbbf4bd0fe35889e26fc46f94c4ca6382d8':
  Remove Type X Tags from the top-level API.
 2010-12-07 14:04:40 -08:00
Martijn Coenen
72df4ea830 Remove Type X Tags from the top-level API. 
Also added an extra to carry the ndef message, so we can have it in multiple
Ndef instances without doing an active read.

Change-Id: I2ecabc24732990c5c9979ee3a001a7fb13da21d9
 2010-12-07 13:51:47 -08:00
Nick Pelly
8c30a47d80 am 47e6ccb6: Merge "Corrected MIFARE default key set" into gingerbread 
* commit '47e6ccb65ab0088cf04809c234cdb5f747579c8c':
  Corrected MIFARE default key set
 2010-12-07 09:34:47 -08:00