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

158775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
3b47713b26 Update generationId on bitmaps when decoded into by BitmapRegionDecoder 
bug:18921087

This fixes issues where bitmaps are cached as textures, and not
reuploaded when reused by BitmapRegionDecoder, showing stale content.

Change-Id: I7626fd6acd36d8e38723689734855ce9154eb8c8
 2015-01-14 16:55:34 -08:00
Luan Nguyen
596d4e7230 am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps 
* commit 'c9e5c5f72a563c7b8e030a57cf586941d32006f4':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:26:37 +00:00
Luan Nguyen
c9e5c5f72a am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps 
* commit '8a65df39e6ad2fc357c8a327626f40588ce00553':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:19:05 +00:00
John Spurlock
e03e245610 Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev 2014-12-10 19:14:27 +00:00
Luan Nguyen
8a65df39e6 am 258da738: docs: Fix text on step 5 of the opt-in steps 
* commit '258da738463f547eab859c21d32cbfe0f8345ae2':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:10:41 +00:00
John Spurlock
8403b7535b NoMan: Apply audio restrictions when effects are disabled by listeners. 
Bug: 17990185
Change-Id: Id946fab4dd27e2354919de6a98c009bc2e711240
 2014-12-10 13:56:13 -05:00
Dianne Hackborn
d63722429e Merge "Further work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 2014-12-10 18:37:51 +00:00
Luan Nguyen
258da73846 docs: Fix text on step 5 of the opt-in steps 
Bug: 18702823
Change-Id: I294eb017592e896217d7eeea024aa32b9f4f1511
 2014-12-10 10:37:43 -08:00
Dianne Hackborn
ae6cc8af26 Further work on issue #18640385: Add procstats test mode 
Tune sampling periods:

- Lower minimum sample interval when in test mode.
- Add a check when sampling pss to make sure this is at least 1
  second since the pss changed, to reduce the amount of bad
  data (very small pss samples) that we see.

Change-Id: I624a7d0480f3f6b22d229744e028d13a2c7b0e89
 2014-12-10 10:33:27 -08:00
Geoff Mendal
5431d1e9a4 am 2bb00d52: (-s ours) Import translations. DO NOT MERGE 
* commit '2bb00d5254b69d903728322cdd79fa2ce0fa491b':
  Import translations. DO NOT MERGE
 2014-12-10 18:31:30 +00:00
Wink Saville
eb4de87683 Merge "Update API and documentation for invalid subscriptions id's" into lmp-mr1-dev 2014-12-10 17:56:58 +00:00
Dianne Hackborn
6bdbae07cf Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev 2014-12-10 17:23:07 +00:00
Geoff Mendal
2bb00d5254 Import translations. DO NOT MERGE 
Change-Id: I5bd1364488d92127594b2f8d6d39ae9b18495be1
Auto-generated-cl: translation import
 2014-12-10 09:13:28 -08:00
Geoff Mendal
295dc00409 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-10 17:07:24 +00:00
Craig Mautner
7a17e0b601 Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev 2014-12-10 16:56:15 +00:00
Geoff Mendal
7e7646487e Import translations. DO NOT MERGE 
Change-Id: I101fba3b08265cb881495252573df6088a439955
Auto-generated-cl: translation import
 2014-12-10 08:40:30 -08:00
Jorim Jaggi
c79343ce65 Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev 2014-12-10 16:32:20 +00:00
Jorim Jaggi
826730aeb9 Fix SysUI when an app started from the affordances crashes 
- Fix infinite recursion in this case.
- If the app crashes, we are waiting for either setOccluded or
  hideKeyguard to be called. However, neither of these gets called
  in this case, so we recover from it by adding a timeout of 5
  seconds.

Bug: 18652789
Change-Id: Ib9a043f5692a8578703df1db08e1a6b9dcfbc742
 2014-12-10 17:22:58 +01:00
Dan Sandler
3585062760 Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev 2014-12-10 15:43:43 +00:00
Jason Monk
4630c89a76 BluetoothControllerImpl: track bluetooth better 
Match settings behavior better:
 - Get connection info from profiles so it is for all devices
   (CONNECTION_STATE_CHANGED only updates one)
 - Disconnect from all known connections so that 'x' does something
 - When device is disconnected without CONNECTION_STATE_CHANGED
   then find a new 'last' device that is connected
 - Listen to a bunch more broadcasts to make sure info is always
   up to date.

Bug: 18210666
Bug: 18638010
Change-Id: Ie003b67bbdd0d452b7472c644d90bca929e5cd29
 2014-12-10 10:32:43 -05:00
Geoff Mendal
fa3f43145a Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-10 14:54:48 +00:00
Geoff Mendal
a65ea3dfdc Import translations. DO NOT MERGE 
Change-Id: Icfd467c7b204b82119ee78b0bfa34d385786d251
Auto-generated-cl: translation import
 2014-12-10 06:52:52 -08:00
Geoff Mendal
b7180c450e Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-10 14:30:40 +00:00
Geoff Mendal
aa72294174 Import translations. DO NOT MERGE 
Change-Id: I63ccbdea01d869627116121f95c9d35cd64da04e
Auto-generated-cl: translation import
 2014-12-10 06:26:53 -08:00
Jason Monk
28fffd58a1 Merge "CarrierText clear itself when no mob. data support" into lmp-mr1-dev 2014-12-10 14:25:39 +00:00
Erik Kline
33cd463bbb Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev 2014-12-10 07:29:47 +00:00
Ricardo Cervera
7cc203d734 am f49c37e7: am 933005e9: am 900efcc9: docs: Add details to Packaging Wearable apps. 
* commit 'f49c37e723b2f1b4f03cce0b205feb84e9c18648':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:57:22 +00:00
Joe Fernandez
17cf77898a am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 
* commit '5ff0805238787f938bf5bcadba46ac8f92e8d440':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 05:57:19 +00:00
Ricardo Cervera
f49c37e723 am 933005e9: am 900efcc9: docs: Add details to Packaging Wearable apps. 
* commit '933005e9e2912a5695ae8b1eeadcb77b05309d2d':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:49:52 +00:00
Joe Fernandez
5ff0805238 am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 
* commit 'dfd05f0a867a4c5f6d940aa41a11c034fb7934ab':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 05:49:49 +00:00
Ricardo Cervera
d56b7a39e1 am 504e213f: am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 
* commit '504e213fd514f7210eaa95df48620c26c0382487':
  docs: Creating Custom Watch Faces training class.
 2014-12-10 05:46:39 +00:00
Ricardo Cervera
2a34e71947 am c0d08616: am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev 
* commit 'c0d08616f2280d7c7359bf27e33c0c012a906803':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:46:34 +00:00
Ricardo Cervera
933005e9e2 am 900efcc9: docs: Add details to Packaging Wearable apps. 
* commit '900efcc91c980a0b30fc1d3017e33e30198b8eb8':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:43:00 +00:00
Joe Fernandez
dfd05f0a86 am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 
* commit '1832978cf6355515016139e453ced187f4b4e29d':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 05:42:56 +00:00
Ricardo Cervera
504e213fd5 am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 
* commit 'ea15366ae304844756ebdd3d0464b8f9f8d9ce9f':
  docs: Creating Custom Watch Faces training class.
 2014-12-10 05:39:40 +00:00
Ricardo Cervera
c0d08616f2 am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev 
* commit 'c6361d8df220200419b679ac573c06a86b5fd1ef':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:39:36 +00:00
Ricardo Cervera
900efcc91c docs: Add details to Packaging Wearable apps. 
Bug: 17943949

(cherry picked from commit 07c9c63e3dd7ee6c752abed3ba54faa949184ca8)

Change-Id: I765285b7e1a17928778ac161c73b2e48b82b54d6
 2014-12-10 05:36:09 +00:00
Joe Fernandez
1832978cf6 Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 2014-12-10 05:35:22 +00:00
Ricardo Cervera
0342d70e4e am f94ee2c1: am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs 
* commit 'f94ee2c10ce168f6eef39cc25dd663bb8b79eac9':
  docs: Design guidelines for watch faces draft.
 2014-12-10 05:34:57 +00:00
Ricardo Cervera
ea15366ae3 am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 
* commit '26e2105575939918e362f14b854176bc54e39b44':
  docs: Creating Custom Watch Faces training class.
 2014-12-10 05:34:39 +00:00
Ricardo Cervera
c6361d8df2 Merge "docs: Add details to Packaging Wearable apps." into lmp-dev 2014-12-10 05:32:19 +00:00
Ricardo Cervera
26e2105575 Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 2014-12-10 05:28:33 +00:00
Ricardo Cervera
f94ee2c10c am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs 
* commit 'ec656c51eec62b8b6a8599675add07762f0587cd':
  docs: Design guidelines for watch faces draft.
 2014-12-10 05:28:04 +00:00
Ricardo Cervera
7db2979684 docs: Creating Custom Watch Faces training class. 
Bug: 18338418
Bug: 18533881

Change-Id: I71d38c73b6a76c9bec8b646967a93d60b05c639b
 2014-12-09 21:26:58 -08:00
Ricardo Cervera
ec656c51ee am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs 
* commit '0024f12dec948d25738c28175ac26d9829b6cd7b':
  docs: Design guidelines for watch faces draft.
 2014-12-10 05:21:30 +00:00
Patrick Tjin
e37030505e Add recovery kmsg to dropbox 
Bug: 18642766

Change-Id: I10e4532904a3a8cac43bec7630b9a7a90c2424ba
Signed-off-by: Patrick Tjin <pattjin@google.com>
 2014-12-10 05:16:33 +00:00
Ricardo Cervera
0024f12dec Merge "docs: Design guidelines for watch faces draft." into lmp-docs 2014-12-10 05:12:50 +00:00
Dianne Hackborn
80b1c5608e Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#... 
...testCallActivityOnNewIntent test fails with LMP-MR1 Release.

Check for null.

Also fix some small issues with converting intents to/from intents.

Change-Id: Ic391cc57552635935af9a271b2d09353257f6d14
 2014-12-09 20:22:08 -08:00
smain@google.com
5a267e72b2 am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language." into lmp-docs 
* commit '5b16e21b9f1b750d66060a25fadfe35c3ebfed30':
  misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language.
 2014-12-10 03:53:26 +00:00
Joe Fernandez
913a683de9 am f8527c7f: am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs 
* commit 'f8527c7f82d1197a7ebaf9caf1a199165b47e353':
  docs: Add Distributing to Android Wear doc
 2014-12-10 03:53:22 +00:00