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

65974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
fe2d34a89e am 290684ac: docs: fix expansion library package name 
* commit '290684ac2eadf786d2f478d3d280eb3058627789':
  docs: fix expansion library package name
 2012-03-05 17:41:25 -08:00
Scott Main
290684ac2e docs: fix expansion library package name 
Change-Id: I38303b5650fd924ac25281baf4a7da51aa939394
 2012-03-05 17:35:36 -08:00
Eric Fischer
a1c6435a5d Merge "Import translations. DO NOT MERGE" into ics-aah 2012-03-05 15:16:56 -08:00
Scott Main
d159a983c4 am a47d88a7: docs: dashboard update for march 5 
* commit 'a47d88a7d25da74319dc3decf80d98516a85fab2':
  docs: dashboard update for march 5
 2012-03-05 14:36:11 -08:00
Scott Main
a47d88a7d2 docs: dashboard update for march 5 
Change-Id: Ic71a478ad8afd818dfe9c0a2341e1d1937be5444
 2012-03-05 14:32:15 -08:00
Eric Fischer
ff799e7f16 Import translations. DO NOT MERGE 
Change-Id: Ib5184c43b98ced2c4386c3e55a078c96198e1238
 2012-03-05 14:04:40 -08:00
Scott Main
6e73cc2fbd am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code 
* commit '2df6ecc508f6b30fd5d005394effa64272584caa':
  docs: add note about declaring file sizes with sample app's code
 2012-03-05 13:26:53 -08:00
Scott Main
2df6ecc508 docs: add note about declaring file sizes with sample app's code 
Change-Id: I7858956916c0db5a585228a890a20fb004155b8c
 2012-03-05 13:22:56 -08:00
Scott Main
3345b2c28d am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1 
* commit '6f63d6fc044f259b7c796e7b7e8c5c8e4a3a3aed':
  docs: updates to OBB guide for naming; plus other edits
 2012-03-05 11:53:03 -08:00
Scott Main
6f63d6fc04 Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1 2012-03-05 11:51:03 -08:00
Scott Main
837a5d83f5 docs: updates to OBB guide for naming; plus other edits 
Change-Id: I0a3afa0388f89d7464471917fec7d767748a870e
 2012-03-05 11:49:12 -08:00
Scott Main
d593f84691 am 93dc642e: docs: fix misc bugs from external tracker 
* commit '93dc642eaf48e3db58c4929df26283fbc5fd663f':
  docs: fix misc bugs from external tracker
 2012-03-05 10:05:47 -08:00
Kevin Hester-Chow
2d72be20fe Do not assume that there is always a running activity 
(Necessary for headless devices)

Change-Id: I61969ebfdd4aa02a3661272a0bcd0aa67667f115
 2012-03-05 08:01:00 -08:00
Scott Main
93dc642eaf docs: fix misc bugs from external tracker 
Change-Id: I2be617be23d0ac50baabac561d510633fa9f162a
 2012-03-02 16:55:41 -08:00
Scott Main
698b2e8123 am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing 
* commit '4143781cdea0741ce6e87967c4ab903288c3e4c3':
  docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
 2012-03-02 16:40:28 -08:00
Scott Main
4143781cde docs: add docs for market OBB 
includes splitting the Licensing dev guide into multiple pages;
Turned original licensing doc into a redirect to the new
files that are under guide/market/licensing/;
Fix all links pointing to app licensing

Change-Id: Ic49493f0e560db225dd7a382ffabc904a2fa1228
 2012-03-02 16:29:33 -08:00
Lei Zhang
5d7bd79903 Merge "Add batch volume adjust support to adjustMasterVolume() in AudioManager and AudioService." into ics-aah 2012-03-02 14:38:21 -08:00
Eric Fischer
589d3b5636 Import translations. DO NOT MERGE 
Change-Id: Iaca5aba60b53f8738c4a25ae840aa9765934b42a
 2012-03-02 12:59:34 -08:00
Lei Zhang
d674dd50b7 Add batch volume adjust support to adjustMasterVolume() in AudioManager and 
AudioService.

Change-Id: I34382839622a5cc5f2a8768aed011e8224cadff9
 2012-03-02 11:48:28 -08:00
Robert Ly
7f38854ee1 am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'e5e11fd666d242b099466017c6d9bd23e6d2896d':
  docs: fixing bug 5942573
 2012-03-02 09:06:57 -08:00
Robert Ly
e5e11fd666 Merge "docs: fixing bug 5942573" into ics-mr1 2012-03-02 09:04:16 -08:00
Dianne Hackborn
ef673eb803 am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '0dd9ec144b0da8df9d8900d78c8177e761de458d':
  Make ResolverActivity update dynamically.
 2012-03-02 08:32:45 -08:00
Dianne Hackborn
0dd9ec144b Merge "Make ResolverActivity update dynamically." into ics-mr1 2012-03-02 08:30:36 -08:00
Dianne Hackborn
e8f2c7ff5a Make ResolverActivity update dynamically. 
Watches for package changes so it can dynamically adjust
to reflect the actual list of available activities.

Change-Id: I3a2fef3dac4d13d1b2a7ed6fc117a7b814679669
 2012-03-01 19:14:36 -08:00
Tsu Chiang Chuang
5e74a89867 am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '3e70127021f5d5940edfdefd7e33fd65d4ec0449':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:07:38 -08:00
Tsu Chiang Chuang
3e70127021 Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 2012-03-01 17:05:43 -08:00
Robert Ly
9eebce976c am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '941ff38d05f1d870df224ac329d16ab2207b94a1':
  fix bug 5942522
 2012-03-01 14:10:28 -08:00
Robert Ly
941ff38d05 Merge "fix bug 5942522" into ics-mr1 2012-03-01 14:08:40 -08:00
Robert Ly
f4040e47b5 am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit 'dcc910ea6eb724fe7e0a415afcdf1a5aefc42f06':
  docs: fix bug 5878445
 2012-03-01 12:51:01 -08:00
Christopher Tate
ff7ce3c124 Merge "Send UpdateLock broadcasts to manifest receivers" into ics-aah 2012-03-01 12:46:19 -08:00
Robert Ly
dcc910ea6e Merge "docs: fix bug 5878445" into ics-mr1 2012-03-01 12:42:24 -08:00
Christopher Tate
f79f800864 Send UpdateLock broadcasts to manifest receivers 
So that e.g. the system update service doesn't need to run all the time.

Bug 5543442

Change-Id: Icd0fcc7f771f7ba92ff190ffed0f0debba4bd911
 2012-03-01 12:39:25 -08:00
Tsu Chiang Chuang
4b1afab106 extend timeout to allow for more time for the device to connect. 
Change-Id: If3929ca69a5025c7048d57276813c270229a76db
 2012-03-01 12:28:14 -08:00
Yu Shan Emily Lau
e5feb487dc am eb4f3256: Set the video encoding bit rate for the media recorder stress test. 
* commit 'eb4f3256b77fe7fd783297a550a64ea441c41169':
  Set the video encoding bit rate for the media recorder stress test.
 2012-02-29 19:00:07 -08:00
Yu Shan Emily Lau
eb4f3256b7 Set the video encoding bit rate for the media 
recorder stress test.

Change-Id: I1fa5965d2ba0e17be97ff3b9bd8df3df4e438087
 2012-02-29 15:57:21 -08:00
Eric Fischer
c46c87aa21 am fb393f8b: Mark configuration strings as not translatable. 
* commit 'fb393f8bd79602c933dc829bd36070dd78be2872':
  Mark configuration strings as not translatable.
 2012-02-29 13:26:09 -08:00
Eric Fischer
fb393f8bd7 Mark configuration strings as not translatable. 
Change-Id: I041a6a951dfe70881a095d7ef085b0246a9d4c3b
 2012-02-29 13:19:58 -08:00
Roman Nurik
ee6e2475c6 am a53b3bfa: docs: Android Design downloads section, linkable H2s. 
* commit 'a53b3bfaadd14aa325c6d6dc2542d7cbea66fc85':
  docs: Android Design downloads section, linkable H2s.
 2012-02-29 12:43:36 -08:00
Roman Nurik
a53b3bfaad docs: Android Design downloads section, linkable H2s. 
Change-Id: I4ed3006117efd740ff5f3bc93df2ac75c2dfd2f9
 2012-02-29 12:15:32 -08:00
Christopher Tate
8c218b78b3 Merge "Introduce UpdateLocks - "now is not a good time for non-interactive OTA"" into ics-aah 2012-02-29 11:47:02 -08:00
Robert Ly
bcee361320 am f4994b3e: Merge "fix bug 5911175" into ics-mr1 
* commit 'f4994b3eb03e1e772d7d46e8b6dcfc88593db792':
  fix bug 5911175
 2012-02-28 15:39:30 -08:00
Robert Ly
f4994b3eb0 Merge "fix bug 5911175" into ics-mr1 2012-02-28 15:37:21 -08:00
Dianne Hackborn
49b39ced82 am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 
* commit '27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
  Fix issue #6073913: onActivityResult() not getting called...
 2012-02-28 15:03:04 -08:00
Christopher Tate
66e817655a Introduce UpdateLocks - "now is not a good time for non-interactive OTA" 
An "UpdateLock" works similarly to a wake lock in API: the caller is
providing a hint to the OS that now is not a good time to interrupt
the user/device in order to do intrusive work like applying OTAs.
This is particularly important for headless or kiosk-like products
where ordinarily the update process will be automatically scheduled
and proceed without user or administrator intervention.

UpdateLocks require that the caller hold the new signatureOrSystem
permission android.permission.UPDATE_LOCK.  acquire() and release()
will throw security exceptions if this is not the case.

The "is now convenient?" state is expressed to interested parties
by way of a sticky broadcast sent only to registered listeners.  The
broadcast is protected; only the system can send it, so listeners
can trust it to be accurate.  The broadcast intent also includes a
timestamp (System.currentTimeMillis()) to help inform listeners that
wish to implement scheduling policies based on when the device became
idle.

The API change here is a tiny one: a dump(PrintWriter) method has been
added to the TokenWatcher class to facilitate getting information out
of it for dumpsys purposes.  UpdateLock itself is still @hide.

Bug 5543442

Change-Id: Ic1548dd43935f45d4efc67f970abdc290a45f715
 2012-02-28 15:01:30 -08:00
Dianne Hackborn
27e20ccd9a Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 2012-02-28 15:01:05 -08:00
Dianne Hackborn
5c607433e3 Fix issue #6073913: onActivityResult() not getting called... 
...if the process is killed and restarted

Try to ensure that in all cases we deliver an activity result if one
was requested.

Change-Id: Id43e830d2ee782f98ed1e3b68e5e16f3258d4ad8
 2012-02-28 14:45:23 -08:00
felipeal
b6fcb5362f am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit 'e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
 2012-02-28 14:04:20 -08:00
felipeal
e4ef9b1ac2 DO NOT MERGE 
(from master: Fixed minor typo on Javadoc)

Change-Id: I7d62e37011a7fd4d792fdfe5bd62022a850303a6
 2012-02-28 13:47:15 -08:00
Jason Noguchi
365a4ca780 am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
  Adding time lapse test to mediaframework stress suite.
 2012-02-28 11:49:36 -08:00
Jason Noguchi
ee32993095 Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 2012-02-28 11:47:46 -08:00