237156 Commits

Author SHA1 Message Date
Robert Shih
c67abec674 Fix MediaExtractor.getDrmInitData implementation for webm
Should lookup "crypto-key" in individual track formats instead of file format.

Bug: 26070802
Change-Id: I1a0f59e7bca1d311631e7ad90b9a403ac20d319b
2016-04-01 16:25:53 -07:00
Jason Monk
becc30196d Merge "Update the wifi on but disconnected qs icon" into nyc-dev 2016-03-31 17:40:20 +00:00
Jason Monk
be83cc0044 Update the wifi on but disconnected qs icon
Change-Id: Icb3ef57e7fa540868716107206d710dc4048aa90
Fixes: 27900385
2016-03-31 13:38:59 -04:00
Siyamed Sinir
e14bab859e Merge "Benchmarks for Linkify" into nyc-dev 2016-03-31 17:17:18 +00:00
Joe Onorato
d0f83b7bca Merge "Include process state in association tracking" into nyc-dev 2016-03-31 17:09:24 +00:00
Chris Craik
08f41dfb8c Merge "Fix layer damage and clipping for Text shadows" into nyc-dev 2016-03-31 17:08:04 +00:00
Victor Chang
e04ac3d7d2 Merge "Unit test for isProvisioningAllowed" into nyc-dev 2016-03-31 17:04:38 +00:00
Dongwon Kang
8904a1a1df Merge "TIF: Address comments on hardware manager related system APIs" into nyc-dev 2016-03-31 17:01:36 +00:00
Sunny Goyal
56d3dd8af7 Merge "Chaning LauncherActivityInfo to return a density specific non-badged icon" into nyc-dev 2016-03-31 16:56:31 +00:00
John Reck
c48dd5d81e Merge "Expand JankTracker" into nyc-dev 2016-03-31 16:49:29 +00:00
Wei Liu
2049029068 Merge "Start the Wear bluetooth service in SystemServer." into nyc-dev 2016-03-31 16:47:52 +00:00
Dongwon Kang
8f647b5cdb Merge "TIF: Add more class documentation on TvInputManager" into nyc-dev 2016-03-31 16:46:35 +00:00
Wei Liu
48d3b63b60 Start the Wear bluetooth service in SystemServer.
Change-Id: I4ca420d7adbb0edd6539fe4bf6ada05650164866
2016-03-31 09:44:41 -07:00
Fyodor Kupolov
1b8189d825 Merge "[FBE] Split accounts.db into two DE/CE databases" into nyc-dev 2016-03-31 16:16:48 +00:00
Yi Kong
9272822dc0 Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be
Bug: 27762555
Change-Id: I03984f4319ba21976078b2b3dff1a857eb5ebd0a
(cherry picked from commit a7af7593fb41b7f67de8f3206233b576ebaaef48)
(cherry picked from commit c0f67813c31bd25ec40c98a4f1e77f98bdabbb48)
2016-03-31 16:04:27 +00:00
Jason Monk
33b30609ff Merge "Remove panel paddings/margins when QS is customizing" into nyc-dev 2016-03-31 15:43:46 +00:00
John Reck
660108075e Expand JankTracker
Bug: 27922347

* Dump the full histogram
* Expand the histogram to have a slow-frame section with
  large 50ms buckets to raise the cap to 5s to give more
  insight into system-health
* Stop excluding first-frame metrics as we want to include
  those in our global tracking. Automated tests already filter
  these out by doing resets before running anyway.

Change-Id: Idaba8aad591f59d10a6477b11efc0767ff715083
2016-03-31 08:40:23 -07:00
Jason Monk
26350a4276 Merge "Fix QS battery tile state" into nyc-dev 2016-03-31 15:32:18 +00:00
Jason Monk
8b2ce60ba8 Fix QS battery tile state
Don't share drawables across multiple imageviews.  Instead generate
a new drawable for each one.

Change-Id: I70259f978af73525d9f6ec772ecd94f2ca9c75bf
Fixes: 27786862
2016-03-31 11:30:41 -04:00
Gustav Sennton
ef40c9acd5 Merge "Simplify WebViewProviderInfo - move its logic into WebViewUpdateService." into nyc-dev 2016-03-31 15:28:53 +00:00
Jason Monk
7492e75ba3 Merge "Fix build" into nyc-dev 2016-03-31 14:00:53 +00:00
Jason Monk
d9b7909989 Fix build
Change-Id: I75e49ea144d47819c0fb7b4cd2e19a6c42b28ff1
2016-03-31 10:00:09 -04:00
Andrew Johnson
08a3fa7dea Merge "Removing assignments to localeScriptWasComputed in aapt." into nyc-dev 2016-03-31 13:52:10 +00:00
Jason Monk
3db45036df Merge changes from topic 'SettingsMetrics' into nyc-dev
* changes:
  Add constants for settings suggestions metrics
  Add some constants for settings conditionals
2016-03-31 13:47:34 +00:00
Jason Monk
1b5d87ba5f Add constants for settings suggestions metrics
Bug: 27851236
Change-Id: Ia5962a5430246c7fa1221a638447c8c86b011223
2016-03-31 09:45:43 -04:00
Jason Monk
c36203965a Add some constants for settings conditionals
Bug: 27851236
Change-Id: I3725be01e0d5de13b81f82ec594bed5f95b5bb18
2016-03-31 09:44:10 -04:00
Bill Yi
ba25767b1b Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-31 13:23:21 +00:00
Gustav Sennton
dbf5eb04e6 Simplify WebViewProviderInfo - move its logic into WebViewUpdateService.
The WebViewProviderInfo should now be ready to be added as an API to be
fetched from XTS tests (to avoid using reflection).

Move the logic for validation, signature checking and package info
fetching out of WebViewProviderInfo so that we can mock the coupling
between that logic and the system (e.g. the package manager).

Note: with this patch we stop caching valid webview packages in the
update service (we would still refetch them anyway when anything
important happened).

Bug: 27635535
Bug: 27736084

Change-Id: Ia455202d2fd5bc4e03dce0fd917d262bf942d1a3
2016-03-31 14:21:47 +01:00
Paul Duffin
baa72515f6 Remove RawCollationKey/ByteArrayWrapper from the public API
Bug: 22023363
Change-Id: I03b89260a9af9a2f6d4e25799c3942ca2579e26e
2016-03-31 14:09:16 +01:00
Paul Duffin
71498f107c ICU4J: Hide constants that can change between releases
Bug: 27830659
Change-Id: Ia8274c3b9b26762de5ef3317261ef0c2a45246c3
2016-03-31 14:09:16 +01:00
Andrei Stingaceanu
aa60469445 Merge "AfW - suspend apps - API polish" into nyc-dev 2016-03-31 10:57:58 +00:00
Michal Karpinski
31f59f1106 Merge "Adjusting javadocs for process logging" into nyc-dev 2016-03-31 09:56:24 +00:00
Diego Perez
9d1a69ff55 Merge "Implement VirtualRefBasePtr native methods" into nyc-dev 2016-03-31 08:14:26 +00:00
Jeff Sharkey
2c0ae91f2d Merge changes Ifecff4f1,Ia302de46 into nyc-dev
* changes:
  Make preferred activities direct-boot aware.
  Make Parcelable classes final, API cleanup.
2016-03-31 06:48:55 +00:00
Yohei Yukawa
4f172d8673 Merge "Remove "Other keyboards" from IME switcher dialog." into nyc-dev 2016-03-31 06:12:32 +00:00
Yohei Yukawa
a102dbddaa Remove "Other keyboards" from IME switcher dialog.
Per comment from UX team, we remove "Other keyboards" button from the
IME switcher dialog because it now points to a stale location, and is
not really needed.

Bug: 27924222
Change-Id: I23b20de3ee0efbb67b7ccac2f9e458b6689dd4ed
2016-03-31 06:07:38 +00:00
Jeff Sharkey
0436b1d5a2 Make preferred activities direct-boot aware.
When matching a list of ResolveInfo against the preferred activity
list, we shouldn't mutate the preferred set based on activities that
might be hidden due to the user being locked.

Bug: 25578136
Change-Id: Ifecff4f11c7fddef3eed04325d396f7c43d6703a
2016-03-30 23:41:13 -06:00
Jeff Sharkey
70168dde6e Make Parcelable classes final, API cleanup.
Remove some Context methods that leaked through.  Add lint rule to
recommend using List<? extends Parcelable> instead of Parcelable[].

Bug: 27932224, 27930145, 27932911
Change-Id: Ia302de46cdb0c5101fa175a09316df91aeefcf0d
2016-03-30 23:31:39 -06:00
Bill Yi
77d4d8f90f Import translations. DO NOT MERGE
Change-Id: I59f563780cebed31c23117028a5025e16f37b8ea
Auto-generated-cl: translation import
2016-03-30 22:18:13 -07:00
Jeff Sharkey
e0ac839801 Merge "Make DreamManagerService FBE aware." into nyc-dev 2016-03-31 05:01:49 +00:00
Bill Yi
c03c77edc0 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-31 04:18:41 +00:00
Bill Yi
25b12ac54e Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-31 04:18:13 +00:00
Bill Yi
a41213f87d Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-31 04:17:54 +00:00
Bill Yi
117dd705c4 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-31 04:17:33 +00:00
Philip P. Moltmann
c1ed9ebec7 Merge "Parse and validate txt records." into nyc-dev 2016-03-31 03:52:50 +00:00
Tomasz Mikolajewski
88f8675471 Merge "Unhide DocumentsContract.EXTRA_ORIENTATION." into nyc-dev 2016-03-31 03:50:19 +00:00
Tomasz Mikolajewski
e1d0cabb5f Merge "Unhide ExifThumbnail.getThumbnailRange() and make it match the comment." into nyc-dev 2016-03-31 03:47:41 +00:00
Jeff Sharkey
4afe32d493 Merge "Keep COLUMN_LOCAL_URI working for now." into nyc-dev 2016-03-31 03:46:14 +00:00
Philip P. Moltmann
312c61edab Parse and validate txt records.
Bug: 27696905
Change-Id: I9affcf02a51c92a2be1c2bfc5efbd09065e100bc
2016-03-30 20:33:31 -07:00
Bill Yi
d84eed1d28 Import translations. DO NOT MERGE
Change-Id: Ia554f35ef10e80690cfe3cf5fdf0c004a7687fe1
Auto-generated-cl: translation import
2016-03-30 20:25:05 -07:00