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

192490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
7470945396 Doc change: adjust distribute and preview card grids and styles. 
Change-Id: I0b0fd5688c5efdb881d677173afdfb5f63d2fa73
 2015-05-17 20:36:16 -07:00
Chris Wren
6650e5767b log notification longevity and freshness 
Split out monolithic visibility notifications into individual logs for
each visibility change with longevity and freshness.

Add exposure time to cancelation logs.

Bug: 20122735
Change-Id: I56c112cdb54fb65b41cfbef4c36ce8706729c5cb
 2015-05-17 22:14:47 -04:00
The Android Automerger
2e8de0f0b3 merge in mnc-release history after reset to mnc-dev 2015-05-17 01:01:38 -07:00
Svet Ganov
19877fa5f6 Revert a deleted file. 
Change-Id: I48067da4316762e8a8a4562977c4b84655fdf0f4
 2015-05-17 00:48:57 -07:00
Svet Ganov
321f01574e Hide platform platform legacy permissions behind a menu option - framework. 
bug:21195624

Change-Id: I563c448e2abd7d33070ed2d8f62ba1b60a3744e8
 2015-05-16 22:52:33 -07:00
Jae Seo
4b34cc7763 TIF: Pass the playback params as a whole 
Bug: 21172914
Change-Id: I2d89f267d8d83b14b5d436304aa0ff82490211d8
 2015-05-16 15:01:53 -07:00
Roozbeh Pournader
e1fcced61a Merge "Make unicodeWrap() return null if the input string is null." into mnc-dev 2015-05-16 18:52:30 +00:00
Roozbeh Pournader
f156cb31c0 Make unicodeWrap() return null if the input string is null. 
Previously, a NullPointerException was raised if the input was null.

Bug: 12894042
Change-Id: I5c5db484e5659659c1da91079adcba773ba7d83d
 2015-05-16 18:50:18 +00:00
The Android Automerger
c8c03d895b merge in mnc-release history after reset to mnc-dev 2015-05-16 01:02:14 -07:00
Andy Hung
921ded795f Merge "Fix SoundPool.unload() return value" into mnc-dev 2015-05-16 04:11:09 +00:00
Dan Sandler
f6351ece20 Merge "Mmm mmm mmm mmm." into mnc-dev 2015-05-16 03:11:53 +00:00
Glenn Kasten
6e745aecf9 Merge "Rename mChannels to mChannelMask" into mnc-dev 2015-05-16 02:11:56 +00:00
Jérôme Poichet
58cff53a5d Merge "SkScalarDiv and its variants are deprecated" into mnc-dev 2015-05-16 02:05:12 +00:00
Adam Lesinski
3dd41596b1 Merge "AAPT2: Fix layout versioning" into mnc-dev 2015-05-16 01:47:08 +00:00
Andy Hung
a6238ef389 Fix SoundPool.unload() return value 
Bug: 21209627
Change-Id: Ifd5c5f349894744c192cad10c5c875882566ec53
 2015-05-15 18:43:03 -07:00
Lajos Molnar
c9020aff3a media: clarify valid values in PlaybackParams and SyncParams 
Bug: 21134712
Change-Id: I42182733013d70e11d8c59bf4f5daa7eeb374597
 2015-05-15 18:33:28 -07:00
Hemant Gupta
50ba032f4a OBEX: Handle GET operation properly 
This change handles GET operation properly whenever the
Input stream is getting aborted in between. Without this
patch it was observed that GET request was being sent by
DUT even when abort has been sent/received resulting
in IOT issues with some remote devices including PTS.

Change-Id: Idcb4ea04abb57353af5ab1fef050b3a36579892e
 2015-05-16 01:19:19 +00:00
Robert Shih
89942588b7 Merge "MediaPlayer: clean up subtitle controller log spam" into mnc-dev 2015-05-16 01:08:53 +00:00
Fyodor Kupolov
a91a6f68f4 Merge "Hold wakelock while dexopting" into mnc-dev 2015-05-16 00:26:09 +00:00
Alan Viverette
5bc0144302 Update ripple drawable target radius on bounds change 
Only bothers with the background and active ripple, since the exiting
ripples are in hardware animation mode anyway and can't be updated.

Bug: 21079749
Change-Id: I0f70c0c0feea32e2c70bb9b1b0fa3b7846b20c7f
 2015-05-15 17:22:24 -07:00
Robert Shih
a460ea1a2c MediaPlayer: persistent track indices 
Maintain inband (from native extractor) and out-of-band tracks (added by
client) in a single append only vector. This ensures that the same track
corresponds to the same index through out playback.

Bug: 10373268
Change-Id: I87b3ca2d2c710ee9087f7686f82ab0e018f55fd0
 2015-05-15 17:04:32 -07:00
Robert Shih
1973189fe0 MediaPlayer: clean up subtitle controller log spam 
- create a default SubtitleController if not set explicitly
- log warning instead of error

Bug: 17594306
Change-Id: Ie7084205b3555bdfec0a2940d0e56398f778585a
 2015-05-15 17:03:46 -07:00
Eric Laurent
d138e4e751 AudioService: add missing audio becoming noisy intent 
Add missing audio becoming noisy intent when the bluetooth
service is disconnected.

Bug: 21160886.
Change-Id: Idd96610a0ff824bd6337c37df60fa13f5bc6e54b
 2015-05-15 16:41:15 -07:00
Joe Fernandez
71bbd81f54 am a06ac3a0: docs: M Preview Content Sync #1 
* commit 'a06ac3a0d8f5e9da99107803586533503a11f60a':
  docs: M Preview Content Sync #1
 2015-05-15 22:59:03 +00:00
Adam Lesinski
18f84162fe Merge "BatteryStats: Enable bluetooth energy collection" into mnc-dev 2015-05-15 22:57:02 +00:00
Adam Lesinski
719e61fa5f BatteryStats: Enable bluetooth energy collection 
Device firmware has been fixed and bluetooth energy values
should be correct now.

Change-Id: I9b9eff378d81e8de4a3f475c071a4ef26cc97f21
 2015-05-15 15:49:24 -07:00
Luan Nguyen
304ed7162d am e14ffac6: am 193841be: Merge "docs: Add tag heuer logo to wear landing page" into lmp-mr1-ub-docs 
* commit 'e14ffac62eca9656fc552a2e4d914eaecba86b7f':
  docs: Add tag heuer logo to wear landing page
 2015-05-15 22:47:47 +00:00
Joe Fernandez
a06ac3a0d8 docs: M Preview Content Sync #1 
This change list is a snapshot of work in progress on other change
lists. If you have conflicts with this change, you should prefer your
own changes over what is contained in this change.

Change-Id: Ied44713d5078c938fab10d29a3b6e720559144b4
 2015-05-15 15:46:21 -07:00
Zach Johnson
a80282a733 Merge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev 2015-05-15 22:40:35 +00:00
Luan Nguyen
e14ffac62e am 193841be: Merge "docs: Add tag heuer logo to wear landing page" into lmp-mr1-ub-docs 
* commit '193841bebf6be4efa4e0c3a0e5e4a44ceef24f6e':
  docs: Add tag heuer logo to wear landing page
 2015-05-15 22:34:58 +00:00
Paul Mclean
0844dcd070 Merge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"" into mnc-dev 2015-05-15 22:28:31 +00:00
Paul Mclean
788854b8c0 Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" 
This reverts commit 34f5e042904c22643f96d4466caa003073708b62.

Change-Id: Ie2a00ef26b20a662fb0e801925a3721804e427ba
 2015-05-15 22:28:07 +00:00
Alan Viverette
1ac88088ad Merge "Return correct year in DayPickerPagerAdapter.getYearForPosition()" into mnc-dev 2015-05-15 22:25:41 +00:00
Alan Viverette
6044798ef7 Merge "Allow getChangingConfigurations() on DrawableWrapper with null drawable" into mnc-dev 2015-05-15 22:25:26 +00:00
Luan Nguyen
193841bebf Merge "docs: Add tag heuer logo to wear landing page" into lmp-mr1-ub-docs 2015-05-15 22:22:50 +00:00
Paul Lawrence
21c8a49306 Merge "DOn't save encryption settings when not encrypted" into mnc-dev 2015-05-15 22:22:25 +00:00
Adam Lesinski
ce27996c4f Merge "BatteryStatsHelper: Bluetooth wasn't being included in usage list" into mnc-dev 2015-05-15 22:18:59 +00:00
Adam Lesinski
ee36c2861a BatteryStatsHelper: Bluetooth wasn't being included in usage list 
Bug:20892246
Change-Id: I6eaf204a2cd970ff75704be22c9006fe4dc696cd
 2015-05-15 15:18:06 -07:00
Jeff Tinker
7020a1377a Merge "MediaDrm API Updates per api council review" into mnc-dev 2015-05-15 22:13:33 +00:00
Yohei Yukawa
05c1ecc965 Revert "Fix IMMS#mInputShown state inconsistency." 
This reverts commit 8d4a9117fbd0aaf03b8486ef920c73894a12cfcd.

Because of a regression Bug 21161785.

Bug: 21161785
Bug: 18722991
Bug: 20763994
Bug: 20764441
Bug: 20926844
Change-Id: If58612eda08764be0226832c0a73f03683889cdb
 2015-05-15 15:13:24 -07:00
Matthew Williams
c19f13e5f1 Fix bug with jobservice context giving wrong value 
BUG: 20614145
Change-Id: Ibd555732e03646d6d59e6d0effa9f92ec70ca3c4
 2015-05-15 15:13:23 -07:00
Adam Lesinski
2738c96d99 Add -round and -notround qualifier to android runtime/aapt 
The round qualifier denotes a device with a screen shape that
is round. The qualifier shows up after the 'long/notlong' qualifier
and before the orientation 'port/land/square' qualifiers.

Change-Id: I3044258b2703a9165694b79725bade770fa6cea1
 2015-05-15 15:10:58 -07:00
Paul McLean
8c501a3a56 Merge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" into mnc-dev 2015-05-15 22:09:15 +00:00
Paul McLean
34f5e04290 Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java 
Not the cause of, but related to...
Bug: 19082426

Change-Id: I296c67989debc932838b39d63fdb57396448c50c
 2015-05-15 14:58:30 -07:00
Jeff Sharkey
2177ed407b Merge changes from topic 'bench' into mnc-dev 
* changes:
  Command to change force adoptable state.
  Initial pass at storage benchmarks.
 2015-05-15 21:55:57 +00:00
Alan Viverette
e922f49b62 Allow getChangingConfigurations() on DrawableWrapper with null drawable 
Change-Id: Iecf39b53419e07927a3fe3096036a57afd69439a
 2015-05-15 14:53:03 -07:00
Adam Lesinski
038959e851 Merge "Remove UID from kernel cpu accounting when uninstalled" into mnc-dev 2015-05-15 21:25:00 +00:00
Adam Lesinski
b99e6d69c3 Merge "Parse uid_cputime proc file" into mnc-dev 2015-05-15 21:23:09 +00:00
Alan Viverette
bd51b4d0b9 Return correct year in DayPickerPagerAdapter.getYearForPosition() 
Previously it wasn't offsetting the position by the min date's month,
so it would be off by a year if the min date wasn't in January. Also
now updates button visibility whenever the ViewPager's range changes.

Bug: 21203303
Change-Id: Id7a41a4fa48843943c744fb0fecd4bebb798cee5
 2015-05-15 14:18:44 -07:00
Jeff Sharkey
4c099d0c49 Command to change force adoptable state. 
Since user builds can't setprop, add an explicit "sm" verb to change
the force adoptable state.

Bug: 21191915
Change-Id: I719d9b18c1a98c97442a5ddb1cc5512e8e4d3d3f
 2015-05-15 14:15:35 -07:00