1444 Commits

Author SHA1 Message Date
Gloria Wang
a8d7b7477d am ef8a810b: Merge "Update of DRM framework"
* commit 'ef8a810b3b11d177a64111125eaa44bb76624414':
  Update of DRM framework
2010-11-02 14:59:51 -07:00
Dan Bornstein
ab1b304bd4 am ccb75a88: Merge "Update the API file." into gingerbread
* commit 'ccb75a882f670f8928f13a485c0c29b8b8b93af3':
  Update the API file.
2010-11-01 16:09:44 -07:00
Takeshi Aimi
c7b3ccc564 Update of DRM framework
- Overload openDecryptSession() with uri parameter
   in order to accept URI of DRM content,
   Following API is added,
       DecryptHandle*openDecryptSession(const char* uri);.
 - Unify texisting three event types of processDrmInfo()
   so that caller of DRM framework does not have to handle many event types.
 - Let DrmManagerService call load/unload plugins API so that
   client of DRM framework does not have to manage plug-in load/unload.
 - Trivial fix in DrmManagerClient.java is also incorporated.

Changes are made by Sony Corporation.

Change-Id: If62b47fa0360718fdc943e6e6143671d7db26adc
2010-11-02 08:06:06 +09:00
Dan Bornstein
bc19c7bdc0 Update the API file.
My previous change was api-compatible, but some of the incidental data
in the API file (like parameter names) changed. It looks like there
were probably a couple other similar changes too, that hadn't
previously been propagated to the API file; all I did to generate this
change was say "make update-api".

Change-Id: I427a9ceb51212fde515df007613b8687b7228ce7
2010-11-01 14:14:37 -07:00
Dianne Hackborn
c6b7b2dfaa am 70a2c15e: Final SDK API 9. DO NOT MERGE.
* commit '70a2c15ecfd4e8cd8581699d5df8a219c7d5cdb1':
  Final SDK API 9.  DO NOT MERGE.
2010-10-29 19:03:03 -07:00
Dianne Hackborn
70a2c15ecf Final SDK API 9. DO NOT MERGE.
Change-Id: I3e2fc2ebc52eecb26ac3a6bb466447f378fb5de6
2010-10-29 18:50:47 -07:00
Nick Pelly
ba1664b34c am 4bf4b491: Merge "Hide some NFC API\'s." into gingerbread
* commit '4bf4b491be3fbd0f71bb87749a0e31f817b91e08':
  Hide some NFC API's.
2010-10-29 08:15:48 -07:00
Nick Pelly
11b075e218 Hide some NFC API's.
We are leaving enough API so that you can see when any Tag is discovered,
get its ID, and get its NDEF messages.

But for advanced use - creating tag connections and writing messages - we have
2 problems. Firstly a lot of the code is untested
(RawTagConnection.transceive()), or in some cases known not to work
(NdefTagConnection.write()). Secondly, there is still debate about how to
best expose information about Tags.

The set of data/methods exposed for a Tag changes completely depending on the
tag technology. There may be multiple sets of technology implemented in a
single tag. Tag A may have technology X and Y, Tag B may have technology Y
and Z. Furthermore, some NFC controllers will be not be able to use all
technologies, and so Android Device 1 may see technology X and Y on Tag A but
Android device 2 may only see technology X. So we have a pretty challenging
set of constraints to work under, and we are not convinced the current Tag and
NdefTag class is the best approach going forwards.

The Tag application should be able to remain unbundled, since it just needs to
get incoming NDEF Messages.

Change-Id: Ic09f094f33794e10f8d730fffe011c9a5957e0ac
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-28 14:54:52 -07:00
Dianne Hackborn
c2f78020d3 am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread
Merge commit '236568999411214ef440cabc6d12e3bf5f19d8f4' into gingerbread-plus-aosp

* commit '236568999411214ef440cabc6d12e3bf5f19d8f4':
  Fix issue #3126018: No way to specify NativeActivity's native method
2010-10-24 18:38:11 -07:00
Dianne Hackborn
e21d91c694 Fix issue #3126018: No way to specify NativeActivity's native method
Change-Id: I59de6a543e7f7f45d963a905829a3f56f32bf8cf
2010-10-24 14:56:38 -07:00
Nick Pelly
f5b5d177a9 am 07f3bee2: Push Tag/NdefTag implementation details into the service.
Merge commit '07f3bee2db8b6e93ebbf7222676bd9f468e85569' into gingerbread-plus-aosp

* commit '07f3bee2db8b6e93ebbf7222676bd9f468e85569':
  Push Tag/NdefTag implementation details into the service.
2010-10-22 18:20:52 -07:00
Nick Pelly
07f3bee2db Push Tag/NdefTag implementation details into the service.
Tag/NdefTag objects should just be simple data objects. Push the mapping of
internal tag type to public rawTarget/ndefTarget into Nfc Service.

This gives an oppurtunity to clean up some Tag/NdefTag API methods. Most
significantly, adding createMockTag() and createMockNdefTag() to help with
application testing.

There will probably be some more tweaking of the types/targets in
Tag/NdefTag to come, this commit makes that a lot easier.

Also:
- Introduce getActivationBytes() and getPollBytes(). These are just stubs
for NFC service to implement, we have feedback these are really important
to help identify NFC tags.
- Based on outside advice, remove 3B_PRIME (roll into 3B) and TOPAZ (roll
into 3A).

Change-Id: I3e6789c047f6ee5c298bf76c65e0885cf3c15d97
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-22 16:29:43 -07:00
Dianne Hackborn
9c7489f8bd am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread 2010-10-22 14:03:08 -07:00
Dianne Hackborn
5383f502e4 Fix issue #3122240: Expose xlarge in GB.
Plus some other small API cleanup.

Change-Id: I1a3c60f510f99224cccac9cc3f838f04141064f8
2010-10-22 12:59:20 -07:00
Jeff Hamilton
8783b0e20c am 7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread 2010-10-22 12:11:23 -07:00
Jeff Hamilton
da83f513ca Unhide some NFC APIs that are required for the Tag app.
Change-Id: Ic64e00476132dbf4644de5c465e06fe11a264508
2010-10-21 23:43:22 -05:00
Jeff Hamilton
de8635e4c4 am 389a440a: Backport ParcelFileDescriptor.createPipe() from master.
Merge commit '389a440ad13f7b16e8f7c7f1670bdd55f1e2112a' into gingerbread-plus-aosp

* commit '389a440ad13f7b16e8f7c7f1670bdd55f1e2112a':
  Backport ParcelFileDescriptor.createPipe() from master.
2010-10-21 21:08:20 -07:00
Jeff Hamilton
389a440ad1 Backport ParcelFileDescriptor.createPipe() from master.
This allows content providers to expose arbitraty data
through the ContentResolver open* APIs.

Change-Id: I408a0b7cee9cdba5654a962098386c012d6b3549
2010-10-21 22:39:41 -05:00
Dianne Hackborn
101f14b275 am ba501785: Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
Merge commit 'ba501785c7b298198d1c6e4787fd40e98f97da67' into gingerbread-plus-aosp

* commit 'ba501785c7b298198d1c6e4787fd40e98f97da67':
  Implement issue #3116702: New manifest tags for supported screen sizes  DO NOT MERGE
2010-10-21 20:17:56 -07:00
Dianne Hackborn
a6d9c7c04c Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE
Change-Id: Iabf64d86c89d387ffbfbc39f950d308a73fe17eb
2010-10-21 15:32:06 -07:00
Nick Pelly
c0e93a849f am 7ea5c45e: NFC settings cleanup.
Merge commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1' into gingerbread-plus-aosp

* commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1':
  NFC settings cleanup.
2010-10-21 09:38:15 -07:00
Nick Pelly
7ea5c45e8d NFC settings cleanup.
Remove NFC settings from Settings.System. The NFC Service tracks them
internally using SharedPreference.

Revert back to enable()/disable()/isEnabled() - Tag discovery is the
only functionality NFC service performs right now so we don't need to
break it up more explicitly yet. enable/disable is the global NFC
on/off and later we'll add enableDiscovery(), enableTagEmulation(),
enableSecureElement() etc as needed.

Change-Id: Id5b23e89d4a29511835f509962842452075e56cb
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-21 03:54:51 -07:00
Hung-ying Tyan
5102856947 am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread
Merge commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184' into gingerbread-plus-aosp

* commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184':
  Remove ringtone API from SipAudioCall.
2010-10-20 13:54:25 -07:00
Hung-ying Tyan
9b449e5606 Remove ringtone API from SipAudioCall.
(watch out auto-merge conflict for SipAudioCall).

Bug: 3113033, related CL: https://android-git/g/#change,75185

Change-Id: Ib48d3b990e229e0b341e47e10e76934e1a50d10f
2010-10-20 22:51:22 +08:00
Sylvain Fonteneau
824de4b3e3 am dd7341f7: Added missing implementation for NdefRecord.
Merge commit 'dd7341f775ca4d86091f4106d6dfef9214073a7d' into gingerbread-plus-aosp

* commit 'dd7341f775ca4d86091f4106d6dfef9214073a7d':
  Added missing implementation for NdefRecord.
2010-10-18 19:13:29 -07:00
Sylvain Fonteneau
dd7341f775 Added missing implementation for NdefRecord.
Implemented constructor using a byte array to parse.
Added missing exception in method declaration, leading to update api/current.xml

Change-Id: I2660484aef1225e90c2f32a572041a2c3aecf288
2010-10-18 19:09:26 -07:00
Dianne Hackborn
69a19fdbff am 3d2818d3: Remove public resource padding.
Merge commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8' into gingerbread-plus-aosp

* commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8':
  Remove public resource padding.
2010-10-18 18:41:12 -07:00
Dianne Hackborn
3d2818d34f Remove public resource padding.
Change-Id: I8a530a23284a1f2515b1340a1c5e5ed3a0b90780
2010-10-18 18:20:02 -07:00
Brad Fitzpatrick
c9cff071af am b4157a43: Merge "StrictMode: fix docs to actually compile and add a utility method." into gingerbread
Merge commit 'b4157a432cf791906d5b2f6d187f1767357a51bb' into gingerbread-plus-aosp

* commit 'b4157a432cf791906d5b2f6d187f1767357a51bb':
  StrictMode: fix docs to actually compile and add a utility method.
2010-10-18 17:04:55 -07:00
Brad Fitzpatrick
62a1eb58bf StrictMode: fix docs to actually compile and add a utility method.
Yes, this is a last minute public API change, but I'm already getting
a lot of inquiries about how to use StrictMode on a GB device but
targetting Eclair or Froyo.  I'd like a simple answer involving
reflection, but the current API is too painful to use via reflection.

I imagine this will be a common request, and it's much easier for us
to write a little blog post about trying it out if there's an easy way
to use it with reflection.

Change-Id: I1f21aaac7e61e5e90d1e4facc0c787d8daf089b1
2010-10-18 16:36:39 -07:00
Nick Pelly
6b09a90a81 am e47150e9: Fix up NFC permissions.
Merge commit 'e47150e933e6f610546f57183477f324566e521e' into gingerbread-plus-aosp

* commit 'e47150e933e6f610546f57183477f324566e521e':
  Fix up NFC permissions.
2010-10-18 10:26:12 -07:00
Nick Pelly
e47150e933 Fix up NFC permissions.
The initial (vendor) implementation had 4 perms, replace with 1.

Requires no permissions:
- Viewing UID, type of discovered tags and cards.
- Viewing the NDEF message contents of NDEF formatted tags and cards.

Requires android.permission.NFC
- Get/Set the local tag "MyTag"
- Creating or using a RawTagConnection (transceive())
- Creating or using a NdefTagConnection (write()/read())

Change-Id: I1b585c7d91738bed6261277061a48cf7c939482a
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-18 10:04:40 -07:00
Dianne Hackborn
964eb4389b am 42499170: Implement issue #3094621 and #3094609 - wipe sd card
Merge commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0' into gingerbread-plus-aosp

* commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0':
  Implement issue #3094621 and #3094609 - wipe sd card
2010-10-16 16:51:13 -07:00
Dianne Hackborn
424991704b Implement issue #3094621 and #3094609 - wipe sd card
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command

Also since we have decided that it is important to consider
the Crespo storage as internal storage, DevicePolicyManager
gets a new API to be able to wipe it.  (No big deal, since
all of the work for this is now done in the implementation
of the new UI.)

Change-Id: I32a77c410f710a87dcdcbf6586c09bd2e48a8807
2010-10-16 16:32:15 -07:00
Vasu Nori
c6bf3eaab4 am 51679ca8: Merge "bug:3069735 in Download UI app, handle deletes correctly" into gingerbread
Merge commit '51679ca89293ef33275b9681018c09be3948bf1c' into gingerbread-plus-aosp

* commit '51679ca89293ef33275b9681018c09be3948bf1c':
  bug:3069735 in Download UI app, handle deletes correctly
2010-10-13 16:52:57 -07:00
Vasu Nori
216fa22791 bug:3069735 in Download UI app, handle deletes correctly
gingerbread.
(for more detailed comments, please see the dependent CL
Change-Id: Ib90eb9e647f543312c865d3bbf9a06fb867a648b )

2 changes in this CL.
1. add 2 new columns to downloads table in downloads.db:
    mediaprovider_uri = downloaded file's content_uri in mediaprovider db
    deleted = flag is set to true if a file is to be deleted
2. download UI app shows only those files whose 'deleted' flag is not set

Change-Id: I47c5f72b0a0b354fac3abe3a97752130b8189794
2010-10-13 16:18:44 -07:00
Nick Pelly
6066da89a4 am 590b73bc: NFC API revision round 2.
Merge commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6' into gingerbread-plus-aosp

* commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6':
  NFC API revision round 2.
2010-10-12 19:00:54 -07:00
Nick Pelly
590b73bc5b NFC API revision round 2.
- Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag,
  RawTagConnection, NdefTagConnection.
- Add implementations for all of the new NFC API.

Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-12 18:37:26 -07:00
Kenny Root
8bb7a1dfbb am b4de3dca: Merge "OBB: rearrange to be entirely asynchronous" into gingerbread
Merge commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45' into gingerbread-plus-aosp

* commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45':
  OBB: rearrange to be entirely asynchronous
2010-10-11 17:31:06 -07:00
Kenny Root
af9d667ccf OBB: rearrange to be entirely asynchronous
Rearrange structure of MountService handling of OBBs to be entirely
asynchronous so we don't rely on locking as much. We still need the
locking to support dumpsys which has been improved to output all the
data structures for OBBs.

Added more tests to cover more of the error return codes.

Oh and fix a logic inversion bug.

Change-Id: I34f541192dbbb1903b24825889b8fa8f43e6e2a9
2010-10-11 17:22:03 -07:00
Jean-Baptiste Queru
89fbcd72fb resolved conflicts for merge of c2894474 to gingerbread-plus-aosp
Change-Id: Ie00785e37809b677d6e8ab44c47e1f26037793d2
2010-10-10 17:45:45 -07:00
Imre Sunyi
9239612870 Support showing "Cold" battery health.
The Linux kernel supports reporting "cold" battery health to sysfs.
Android framework has not implemented this and it defaults to "unknown"
This adds handling the cold battery health.

Change-Id: Idcc156aae6aabce73391081143f79d052edf332e
2010-10-10 17:20:24 -07:00
Steve Howard
7c08b70c96 am d8d60da6: Merge "Update DownloadManager API to support bulk actions." into gingerbread
Merge commit 'd8d60da616343b3520b666c385d0005db860be83' into gingerbread-plus-aosp

* commit 'd8d60da616343b3520b666c385d0005db860be83':
  Update DownloadManager API to support bulk actions.
2010-10-08 14:44:42 -07:00
Steve Howard
64c48b8842 Update DownloadManager API to support bulk actions.
This includes querying by ID, removing and restarting downloads (the
latter is not a public API).  The methods all use varargs to support
this without undue syntactic pain.

Change-Id: I768005c539d2395cf26587d3a8c425cd01ad9cd2
2010-10-08 14:14:07 -07:00
Brad Fitzpatrick
b323559b13 am a2a1ca42: Merge "DropBoxManager.Entry implements Closeable" into gingerbread
Merge commit 'a2a1ca42bc07af77a8a10b714517d006cb66c36a' into gingerbread-plus-aosp

* commit 'a2a1ca42bc07af77a8a10b714517d006cb66c36a':
  DropBoxManager.Entry implements Closeable
2010-10-08 13:01:29 -07:00
Brad Fitzpatrick
cc792c4149 DropBoxManager.Entry implements Closeable
Change-Id: I61716c06b92fa1b9b5b271b5805550bdb2d51b46
2010-10-08 10:17:03 -07:00
Dianne Hackborn
b77455ee29 am 78d68836: Implement tracking of package install times.
Merge commit '78d688369a2240009d3bbe4126996a973b2e2fe2' into gingerbread-plus-aosp

* commit '78d688369a2240009d3bbe4126996a973b2e2fe2':
  Implement tracking of package install times.
2010-10-07 20:13:24 -07:00
Dianne Hackborn
78d688369a Implement tracking of package install times.
Provides information about the time at which the package was
first installed and the time it was last updated.

Change-Id: Icb43f77b5b669a1ce685e8913046b8be386b6175
2010-10-07 18:48:22 -07:00
Hung-ying Tyan
ea445758ef am 08faac3c: Unhide SIP API.
Merge commit '08faac3c26e12863858e1534985dd950193f755f' into gingerbread-plus-aosp

* commit '08faac3c26e12863858e1534985dd950193f755f':
  Unhide SIP API.
2010-10-07 17:40:51 -07:00
Hung-ying Tyan
08faac3c26 Unhide SIP API.
Change-Id: I09468e3149a242a3b1e085ad220eb74f84ac6c68
2010-10-08 08:31:42 +08:00