Commit Graph

885 Commits

Author SHA1 Message Date
Kenny Root
ea7ee3f4d3 am 8bd545ab: am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread
Merge commit '8bd545ab4f7e75634c970b50ed15c20858d6ac0c'

* commit '8bd545ab4f7e75634c970b50ed15c20858d6ac0c':
  Move all the permissions check up for unmount
2010-09-29 17:17:22 -07:00
Nick Pelly
4715bd91f5 resolved conflicts for merge of f4c3b7e9 to master
Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
2010-09-29 12:20:51 -07:00
Kenny Root
8bd545ab4f am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread
Merge commit '212d81a004f50e51ed8f6d803b79f4b71546b351' into gingerbread-plus-aosp

* commit '212d81a004f50e51ed8f6d803b79f4b71546b351':
  Move all the permissions check up for unmount
2010-09-29 07:53:06 -07:00
Kenny Root
212d81a004 Merge "Move all the permissions check up for unmount" into gingerbread 2010-09-29 07:40:32 -07:00
Kenny Root
f1121dc1d3 Move all the permissions check up for unmount
We have already scanned the state of the OBB in mountObb, so check the
caller against the stored state in the unmountObb call. This allows us
to ensure the calling binder is the same one that mounted it since we
tie the lifecycle of the OBB to the lifecycle of the binder.

Change-Id: I45d9cfbab5d3f5b37a6a9b594b10bd8b91cccc45
2010-09-29 07:38:55 -07:00
Nick Pelly
f4c3b7e916 am 038cabe0: NFC integration
Merge commit '038cabe0247ee46df62f9363f1a303bc5b9c1028' into gingerbread-plus-aosp

* commit '038cabe0247ee46df62f9363f1a303bc5b9c1028':
  NFC integration
2010-09-28 22:40:18 -07:00
Nick Pelly
038cabe024 NFC integration
Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Conflicts:

	core/java/android/app/ApplicationContext.java
	core/java/android/provider/Settings.java
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp
	core/res/AndroidManifest.xml
	include/utils/Asset.h

Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573
Signed-off-by: Nick Pelly <npelly@google.com>
2010-09-28 22:36:27 -07:00
Kenny Root
bff405f910 resolved conflicts for merge of d8e8186c to master
Change-Id: Ica3f6cd958717ea7033cab8b4bf9cd3425c1e1c5
2010-09-28 18:16:50 -07:00
Kenny Root
d8e8186c88 am 05105f7a: Update OBB API to include callbacks
Merge commit '05105f7abe02b2dff91d6260b3628c8b97816bab' into gingerbread-plus-aosp

* commit '05105f7abe02b2dff91d6260b3628c8b97816bab':
  Update OBB API to include callbacks
2010-09-28 17:33:47 -07:00
Steve Howard
d58429f9ac Manual merge: Move DownloadManager to android.app
Changing package at hackbod's request.

Change-Id: I867017b6a9f4684d30c6c5bd1b07f9cabecddb9f
2010-09-28 17:28:43 -07:00
Kenny Root
05105f7abe Update OBB API to include callbacks
Add a callback for users of the StorageManager API to be able to receive
notifications when the requested operation completes for mountObb and
unmountObb.

Add NDK API to get to ObbInfo like the Java API has.

Also update the docs for the API and remove the "STOPSHIP" comments.

Change-Id: I23a4409c7f8b74d3169614beba920b4d667990a4
2010-09-28 17:23:26 -07:00
Steve Howard
9d9719c44a am 5bdb89d7: Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread
Merge commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399' into gingerbread-plus-aosp

* commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399':
  Move DownloadManager to android.app (DO NOT MERGE)
2010-09-28 12:41:42 -07:00
Kenny Root
cc8f44bc81 am e7dd4e38: am 04a426f5: Merge "Use buffered I/O during certificate parsing" into gingerbread
Merge commit 'e7dd4e38c47f2f7760d1ce4f86d6321e17f98d1d'

* commit 'e7dd4e38c47f2f7760d1ce4f86d6321e17f98d1d':
  Use buffered I/O during certificate parsing
2010-09-27 20:32:56 -07:00
Dianne Hackborn
64bbbb471e resolved conflicts for merge of a8bce7c8 to master
Change-Id: I34526a3aed6591639e1a1bff8f42e0c5d8e328cc
2010-09-27 20:25:20 -07:00
Dianne Hackborn
cca1f0e347 Allow all apps to call ContentResolver.getType().
I can't find the bug number for this, but it is needed for some things
we are doing where the app building an intent may not have access to the
URI in the data field.  This is for HC, but doing in GB to avoid introducing
integration issues.

Change-Id: I0cac971854198b18775d2a73deb80f23431bfbe2
2010-09-27 18:05:44 -07:00
Steve Howard
31fd85f39b Move DownloadManager to android.app (DO NOT MERGE)
Changing package at hackbod's request.  I'll merge this manually, as
there's some additional master-only code that will be to be
simultaneously changed.

Change-Id: Ibb629ec1c31807fbee31e0193c6a941d04be0117
2010-09-27 17:12:47 -07:00
Kenny Root
e7dd4e38c4 am 04a426f5: Merge "Use buffered I/O during certificate parsing" into gingerbread
Merge commit '04a426f5b50a628fb73bc29b003b0e5bece17c27' into gingerbread-plus-aosp

* commit '04a426f5b50a628fb73bc29b003b0e5bece17c27':
  Use buffered I/O during certificate parsing
2010-09-27 12:48:05 -07:00
Kenny Root
04a426f5b5 Merge "Use buffered I/O during certificate parsing" into gingerbread 2010-09-27 12:45:44 -07:00
Dianne Hackborn
a8bce7c8ac am d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into gingerbread
Merge commit 'd8691d73d158acd9ffc63748126e822afd656707' into gingerbread-plus-aosp

* commit 'd8691d73d158acd9ffc63748126e822afd656707':
  Allow all apps to call ContentResolver.getType().
2010-09-27 12:45:31 -07:00
Dianne Hackborn
d8691d73d1 Merge "Allow all apps to call ContentResolver.getType()." into gingerbread 2010-09-27 12:42:34 -07:00
Dan Morrill
2b0fa71c1a am c6581a10: am 4e9751f0: Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn\'t yet been settled for Gingerbread, this change doesn\'t go into details
Merge commit 'c6581a1046b062d0e06e50e9b09e6c12a8e54efc'

* commit 'c6581a1046b062d0e06e50e9b09e6c12a8e54efc':
  Adding a feature to indicate that the device possesses low-latency audio.
2010-09-27 11:45:51 -07:00
Dan Morrill
c6581a1046 am 4e9751f0: Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn\'t yet been settled for Gingerbread, this change doesn\'t go into details. We can do a d
Merge commit '4e9751f0770c8bfe6f7d57465cba754af5aa942b' into gingerbread-plus-aosp

* commit '4e9751f0770c8bfe6f7d57465cba754af5aa942b':
  Adding a feature to indicate that the device possesses low-latency audio.
2010-09-27 10:39:19 -07:00
Kenny Root
d63f7dbf5d Use buffered I/O during certificate parsing
The PackageParser was using a raw InputStream instead of wrapping it in
a BufferedInputStream which could degrade performance.

Change-Id: I15c86c3ead363ddbadf4ae27e011feda90fcc579
2010-09-27 08:09:26 -07:00
Dianne Hackborn
8313fc7e94 Allow all apps to call ContentResolver.getType().
I can't find the bug number for this, but it is needed for some things
we are doing where the app building an intent may not have access to the
URI in the data field.  This is for HC, but doing in GB to avoid introducing
integration issues.

Change-Id: I0cac971854198b18775d2a73deb80f23431bfbe2
2010-09-26 21:31:47 -07:00
Dan Morrill
898e1e8860 Adding a feature to indicate that the device possesses low-latency audio.
The specific criteria for low-latency audio are defined in the CDD, but since
that hasn't yet been settled for Gingerbread, this change doesn't go into
details. We can do a docs change later once GB CDD is final.

Change-Id: Ic5ad9d04e8ecd78c81b6f09439affec6bf8cb9b2
2010-09-26 17:28:30 -07:00
Dianne Hackborn
c388844d50 am 234e42df: DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*
Merge commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a' into gingerbread-plus-aosp

* commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a':
  DO NOT MERGE.  Fix issue #3000764: API REVIEW: android.R.*
2010-09-24 18:05:14 -07:00
Dianne Hackborn
234e42df5f DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*
Not going out in GB.

Change-Id: I9d4f5938ec7d2a54c0f72b8eb5a177ee66f12146
2010-09-24 18:00:47 -07:00
Dmitri Plotnikov
4d891e7db5 Making observer registration customizable.
There is a need to skip registering the observer
or register a different observer in cases when
we have an extremely chatty content provider
(think MediaStore).

Change-Id: Iadfb8e0193736cb231762a147c2df1491ad22e0e
2010-09-22 12:51:01 -07:00
Dan Morrill
596b55d9c8 am 62018429: Merge "Adding new feature definitions for new sensors (barometer and gyroscope.)" into gingerbread
Merge commit '62018429c2639b8a0f27e9b18b9b186df80bca4d' into gingerbread-plus-aosp

* commit '62018429c2639b8a0f27e9b18b9b186df80bca4d':
  Adding new feature definitions for new sensors (barometer and gyroscope.)
2010-09-21 17:03:42 -07:00
Dan Morrill
5744bb4aa5 Adding new feature definitions for new sensors (barometer and gyroscope.)
Change-Id: Ic3a35c7b277921eaa5b05e3285b6aed5ed75bea6
2010-09-21 15:27:07 -07:00
Jeff Hamilton
bfb619a12a Merge "Convert Numbers to Booleans when calling getAsBoolean()." 2010-09-17 10:21:55 -07:00
Jeff Hamilton
d208c3a68b Convert Numbers to Booleans when calling getAsBoolean().
Change-Id: I31ad0bccd422f8e76cf37d500a93744cc23d4859
2010-09-17 08:12:19 -05:00
Joe Onorato
04065bdcca am ee76ed9c: am 4198cece: Merge "Fix the rest of the javadoc warnings." into gingerbread
Merge commit 'ee76ed9c0df11ac70ae67bae051cb64c9d79dafb'

* commit 'ee76ed9c0df11ac70ae67bae051cb64c9d79dafb':
  Fix the rest of the javadoc warnings.
2010-09-16 11:32:12 -07:00
Joe Onorato
ee76ed9c0d am 4198cece: Merge "Fix the rest of the javadoc warnings." into gingerbread
Merge commit '4198cececf70bf034e12f19bb87f29cc29931c39' into gingerbread-plus-aosp

* commit '4198cececf70bf034e12f19bb87f29cc29931c39':
  Fix the rest of the javadoc warnings.
2010-09-16 10:41:54 -07:00
Joe Onorato
d3ad696b1d Fix the rest of the javadoc warnings.
Change-Id: Ifbf422a2eb177858813d118f03ceddcd807e73b4
2010-09-16 13:38:25 -04:00
Chris Palmer
c5e2e26b9d am 5bade703: Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread
Merge commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5' into gingerbread-plus-aosp

* commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5':
  DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
2010-09-14 17:45:59 -07:00
Chris Palmer
5bade703fd Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread 2010-09-14 17:43:31 -07:00
Dianne Hackborn
ade9916d5c resolved conflicts for merge of 6421ae7e to master
Change-Id: Ic8c4418f13a42fc1d3a44ad68e32b4e438b07f6f
2010-09-13 21:41:57 -07:00
Dianne Hackborn
6421ae7eff am 5251c800: Merge "Fix potential crash in sync." into gingerbread
Merge commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d' into gingerbread-plus-aosp

* commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d':
  Fix potential crash in sync.
2010-09-13 17:26:34 -07:00
Dianne Hackborn
50addddba5 Fix potential crash in sync.
Change-Id: I523d8faa24b7ba57dcc09cbe91b5cb91d9f6f262
2010-09-13 17:12:51 -07:00
Dianne Hackborn
e746f03c6c resolved conflicts for merge of 53686433 to master
Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d
2010-09-13 16:56:10 -07:00
Dianne Hackborn
53686433a9 am 7e9f4eb2: Track client requests through location manager.
Merge commit '7e9f4eb2608148436cef36c9969bf8a599b39e72' into gingerbread-plus-aosp

* commit '7e9f4eb2608148436cef36c9969bf8a599b39e72':
  Track client requests through location manager.
2010-09-13 14:34:22 -07:00
Chris Palmer
09f3360f51 DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
Make the documentation match the current behavior since change ID
Ibdeff170bd386d723f774136b18e0ad59d9cdabb.

Will add @deprecated tags back in in a separate CL. This is just to get
things in the same state as master, following the build breakage mishap.

Change-Id: I47c53700892473061093002c32ad8f095b5813d1

Do not merge to master; an equivalent CL has already been committed there.
2010-09-13 14:32:24 -07:00
Dianne Hackborn
7e9f4eb260 Track client requests through location manager.
This fixes a problem where applications could ask the location
manager to do very heavy-weight things (like...  say... update
location every minute), which would get accounted against the
system instead of the application because ultimately it is the
system making the heavy calls (wake locks, etc).

To solve this, we introduce a new class WorkSource representing
the source of some work.  Wake locks and Wifi locks allow you
to set the source to use (but only if you are system code and thus
can get the permission to do so), which is what will be reported
to the battery stats until the actual caller.

For the initial implementation, the location manager keeps track
of all clients requesting periodic updates, and tells its providers
about them as a WorkSource param when setting their min update time.
The network location provider uses this to set the source on the
wake and wifi locks it acquires, when doing work because of the
update period.

This should also be used elsewhere, such as in the GPS provider,
but this is a good start.

Change-Id: I2b6ffafad9e90ecf15d7c502e2db675fd52ae3cf
2010-09-13 14:20:48 -07:00
Chris Palmer
f5aafff485 Unbreak the build.
Just a quick fix. Will properly re-add @deprecated and update-api next, and
then get API approval.

Change-Id: Idf57a33dc97bc2619cf48509f74d9e0de935124b
2010-09-13 11:40:44 -07:00
Chris Palmer
ed35d0ee85 Merge "Correct the PackageManager.checkSignatures documentation." 2010-09-13 10:39:04 -07:00
Kenny Root
cec7eb1c07 am 8b11f30c: am 1bece432: Make nativeLibraryDir visible in the API
Merge commit '8b11f30cb2cfe9922439e8a032311de114ce4da4'

* commit '8b11f30cb2cfe9922439e8a032311de114ce4da4':
  Make nativeLibraryDir visible in the API
2010-09-12 19:34:30 -07:00
Kenny Root
8b11f30cb2 am 1bece432: Make nativeLibraryDir visible in the API
Merge commit '1bece4320c1d2308b4a5b5aeda47b065312b3053' into gingerbread-plus-aosp

* commit '1bece4320c1d2308b4a5b5aeda47b065312b3053':
  Make nativeLibraryDir visible in the API
2010-09-12 19:31:45 -07:00
Kenny Root
1bece4320c Make nativeLibraryDir visible in the API
Change-Id: Ic88e76a85b0041e97b4c29c42dfa09db0356391c
2010-09-12 19:20:32 -07:00
Chris Palmer
4285514975 Correct the PackageManager.checkSignatures documentation.
Make the documentation match the current behavior since change ID
Ibdeff170bd386d723f774136b18e0ad59d9cdabb.

Change-Id: I9d24800ba98f14cb278f029cdf37a086394d1747
2010-09-10 14:56:07 -07:00