Commit Graph

139719 Commits

Author SHA1 Message Date
Jason Monk
c37bf2a87e Merge "Fix missed running update-api" 2014-06-17 21:13:21 +00:00
Jason Monk
72c16de7e3 Fix missed running update-api
The build server is stuck on something else, but will likely soon
discover this...

Change-Id: Ib029d07a09d373f8bea1204176f3d00c830c9f0b
2014-06-18 16:00:34 -04:00
Jason Monk
35c62a4668 Notify any profile/device owners of lock task
Add a method for DeviceAdminReceivers of profile/device owners to
be notified that lock task mode has entered or exited for an app
they have whitelisted.

Change-Id: Id124287d41564bbfccdacccf1977b7acb3ddec3f
2014-06-18 14:56:24 -04:00
ztenghui
b9db146d0d Merge "Improve constant state for VectorDrawable" 2014-06-17 21:43:29 +00:00
ztenghui
16c1bd5db8 Improve constant state for VectorDrawable
Now inflation will not cause duplicated constant states.
    And update tests.

Change-Id: I66861e5451c4c10d18756e8522546ea1cb938a55
2014-06-18 12:55:22 -07:00
Alan Viverette
5adf8ee451 Fix bitmap tinting
BUG: 15716407
Change-Id: I4008c9763fedc2f716040cd3f73ad79d77343960
2014-06-18 17:58:35 +00:00
Andy Hung
1ae1fd4692 Merge "Fix AudioFormat getBytesPerSample to recognize float" 2014-06-17 21:46:58 +00:00
Andy Hung
2854ed5025 Fix AudioFormat getBytesPerSample to recognize float
Bug: 15719638
Change-Id: Id53a07ef24e4403f3bad7a13c4dd801e556769eb
2014-06-18 10:51:15 -07:00
Robert Shih
7d4769c183 Merge "Move SubtitleData processing to SubtitleTrack" 2014-06-18 17:00:38 +00:00
Jae Seo
5c80ad2077 Clean up the EPG data when a TV input package is removed
Also removed an unused parameter from sendSessionTokenToClientLocked().

Bug: 14981342
Change-Id: I5bcf6050386a2bc3e216f44420390c4b78282af4
2014-06-18 10:10:07 -07:00
Robert Shih
38c209b938 Move SubtitleData processing to SubtitleTrack
Change-Id: Ia338a7a1b51e449d0ab6df9933ea0efcc2d12849
2014-06-17 16:12:14 -07:00
Kenny Guy
c6543afd6b Merge "Update API for launcher apps to use abstract class." 2014-06-17 22:01:53 +00:00
Jason Monk
7ccf51dd79 Merge "Change clearDeviceOwnerApp to take a package" 2014-06-17 21:03:08 +00:00
Jason Monk
94d2cf9725 Change clearDeviceOwnerApp to take a package
If the caller is sharing uid, then the package from getPackage()
may not be the desired one.  This also matches better with the
other device owner calls.

Change-Id: I14f2ec4bff0717273f626072dabad0d2c76068a5
2014-06-18 09:53:34 -04:00
Derek Sollenberger
58f90ab1ee Merge "Fix namespace for picture" 2014-06-17 21:03:08 +00:00
Derek Sollenberger
a0dc404092 Fix namespace for picture
Change-Id: Id21ebcf2ba4befb4af15cd1d493428a64599afc1
2014-06-18 15:17:50 -04:00
Raph Levien
c802c8cda2 Merge "Implement drawTextOnPath with Minikin" 2014-06-17 21:46:58 +00:00
Raph Levien
9d2b5e1930 Implement drawTextOnPath with Minikin
This patch contains an implementation of drawTextOnPath for both
software and hardware Canvas using Minikin for text layout. One of the
steps for switching all remaining text operations to Minikin so the old
TextLayout and Skia fallback fonts mechanisms can be deleted.

Bug: 11750374 Resolve TODO items for Minikin
Change-Id: I06bfe74a101fa1dcdfc38f530f7194d71e522a85
2014-06-18 11:04:24 -07:00
Craig Mautner
f62d690b00 Merge "Fix persistent tasks and expand scope" 2014-06-17 21:36:48 +00:00
Quddus Chong
c287e2713c am 82ea0eb2: am ef655f26: docs: Added "games" metadata tag for Play Games landing page in d.a.c. Bug: 15709471
* commit '82ea0eb213d75163398fdd0f1da672e058e64f17':
  docs: Added "games" metadata tag for Play Games landing page in d.a.c. Bug: 15709471
2014-06-18 16:14:50 +00:00
Quddus Chong
82ea0eb213 am ef655f26: docs: Added "games" metadata tag for Play Games landing page in d.a.c. Bug: 15709471
* commit 'ef655f26fceba274b75e41f0b085434aa12914c8':
  docs: Added "games" metadata tag for Play Games landing page in d.a.c. Bug: 15709471
2014-06-18 16:07:41 +00:00
Quddus Chong
ef655f26fc docs: Added "games" metadata tag for Play Games landing page in d.a.c.
Bug: 15709471

Change-Id: Ibac4bd844245e71a8cb975bd86d07f9df0c25be5
2014-06-18 08:57:24 -07:00
Griff Hazen
a2d30107c4 am f546eeb1: Merge "DO NOT MERGE Reduce chance of notification listener dropped messages." into klp-modular-dev
* commit 'f546eeb1ede3c33ca3ec7fff6b8deb9d4e5cbc3e':
  DO NOT MERGE Reduce chance of notification listener dropped messages.
2014-06-18 03:18:24 +00:00
Robert Ly
d664830ce4 am 95df0762: Merge "docs: Edits to the L Preview API overview." into klp-modular-dev
* commit '95df0762c40bb79418d5fc8d59bc997a419e6250':
  docs: Edits to the L Preview API overview.
2014-06-18 03:13:23 +00:00
Robert Ly
04095773be am b5d79bd2: Merge "Android TV Landing Page" into klp-modular-dev
* commit 'b5d79bd2ab8b0382e05f38653ce0fbb56290ea58':
  Android TV Landing Page
2014-06-18 03:13:19 +00:00
Joe Fernandez
003ff78a84 am 8e18e016: Wear Landing page fixes
* commit '8e18e0169d3488e9a9ca02d1ff7aee06932a54a3':
  Wear Landing page fixes
2014-06-18 03:13:15 +00:00
Joe Fernandez
8e18e0169d Wear Landing page fixes
- fixed scroll animation
- un-hardcoded G+ widget

Change-Id: I679d6d5baf65516a163bb01ec3bf90c1b53e647b
2014-06-17 20:00:33 -07:00
Craig Mautner
43e52ed32e Fix persistent tasks and expand scope
- Fixed missing tag closure on the xml for storing Intent categories.
- Shortened timeout for flushing tasks to persistent storage from
one minute to ten seconds.
- Made persistency the default except for those tasks on the home
stack and those tasks that exclude themselves from the recent task
list.
- Fixed deletion of tasks after restoring. Tasks now survive a second
reboot, not just the first reboot.
- Fixed sort order so most recent tasks will be restored at front.

Fixes bug 15672002.

Change-Id: I16d87d58c6fd2e879cfd0c0b18b2694432a79b71
2014-06-17 17:22:58 -07:00
Deepanshu Gupta
5ba5ab3111 am 1595c61d: am 5a49fc33: am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]
* commit '1595c61d2f1f081111958b4a22e8fec25402f3cd':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
2014-06-18 00:20:35 +00:00
Deepanshu Gupta
1595c61d2f am 5a49fc33: am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]
* commit '5a49fc331ec7d5aa2532d650c32ea68733cbd5c0':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
2014-06-18 00:15:35 +00:00
Deepanshu Gupta
5a49fc331e am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]
* commit 'c57b410c8ef41e269f82f3b42a8d22a15c08755b':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
2014-06-18 00:10:34 +00:00
Colin Cross
0ead2a00f4 am 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"
* commit '15967d0a8f8f858b0ed6aaf9d5aab5c65b94257f':
  Fix reading memory usage for 64-bit processes
2014-06-17 22:53:09 +00:00
Colin Cross
15967d0a8f am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"
* commit '88b37edaeab7b31cab0f5115e5c9f63a49991408':
  Fix reading memory usage for 64-bit processes
2014-06-17 22:47:50 +00:00
Colin Cross
88b37edaea Merge "Fix reading memory usage for 64-bit processes" 2014-06-17 21:47:03 +00:00
Colin Cross
0c6bc73c5e Fix reading memory usage for 64-bit processes
64-bit process will have virtual addresses that don't fit in an
unsigned long if ActivityManagerService is in a 32-bit process,
and the locations of the '-' and ' ' characters in the maps
are not predictable.  Fix the sscanf for finding the start of the
mapping, and use it again to find the end of the mapping.  Also
fix a few 64-bit warnings.

Change-Id: I8855c76085142768be1d45346f1032fd37cbe4eb
2014-06-17 15:25:45 -07:00
Derek Sollenberger
bc8bd76bc7 Merge "Refactor android.graphics.Picture JNI bindings." 2014-06-17 21:13:21 +00:00
Robert Greenwalt
19f01ebe90 Merge "Remove Obsolete enable/disableApn functions." 2014-06-17 21:43:29 +00:00
Robert Greenwalt
e356825e4a Remove Obsolete enable/disableApn functions.
ConnectivityService now uses NetworkAgents instead and apps should use
ConnectivityManager.

Change-Id: Ifc5c8f5be802183e70a5d92b224c819815de00e6
2014-06-17 14:10:39 -07:00
Jason Monk
fbe6be4f65 Merge "Notify any profile/device owners of lock task" 2014-06-17 21:07:42 +00:00
Adam Lesinski
f90f2f8dc3 Support multiple resource tables with same package
In order to support APK split features, the resource
table needs to support loading multiple resource
tables with the same package but potentially new set
of type IDs.

This adds some complexity as the type ID space changes
from dense and ordered to potentially sparse.

A ByteBucketArray is used to store the type IDs in
a memory efficient way that allows for fast retrieval.

In addition, the IDMAP format has changed. We no longer
need random access to the type data, since we store the
types differently. However, random access to entries of
a given type is still required.

Change-Id: If6f5be680b405b368941d9c1f2b5d2ddca964160
2014-06-18 19:20:08 +00:00
Julia Reynolds
779d2cffbc Merge "Rename apps User Restriction." 2014-06-17 21:03:08 +00:00
Julia Reynolds
36fbc8d645 Rename apps User Restriction.
Change-Id: I9f81a6b94ba06b593e7213967df51c7cb30a7b31
2014-06-18 10:36:15 -04:00
Kenny Guy
a6685f4e43 Update corp badge assets.
Bug: 15445217
Change-Id: Ie91548625be91272ee684be2c314a9d2e9376b76
2014-06-18 12:23:07 +01:00
Jinsuk Kim
a062a9339a Implement portSelect/sendKeyEvent for HdmiControlService
TIF (TV Input Framework) uses these API to switch inputs, send
keys for selected device on CEC bus. Also renamed getActiveInput
to getActivePortId to use a unified term for port/input.

Change-Id: I8196825c0d960988cc1c0bb58a628ccd8ab1957e
2014-06-18 03:53:16 +00:00
Griff Hazen
df48918c3f am a2d30107: (-s ours) am f546eeb1: Merge "DO NOT MERGE Reduce chance of notification listener dropped messages." into klp-modular-dev
* commit 'a2d30107c401f66dacec3853bc9efdbaca7558e8':
  DO NOT MERGE Reduce chance of notification listener dropped messages.
2014-06-18 03:22:28 +00:00
Robert Ly
dc7918654e am d664830c: am 95df0762: Merge "docs: Edits to the L Preview API overview." into klp-modular-dev
* commit 'd664830ce43c7eb6be6b4d11f9740542172cabec':
  docs: Edits to the L Preview API overview.
2014-06-18 03:22:22 +00:00
Robert Ly
6827bded78 am 04095773: am b5d79bd2: Merge "Android TV Landing Page" into klp-modular-dev
* commit '04095773beb2fed34ae7cd3d80c8f6f8e8cea05e':
  Android TV Landing Page
2014-06-18 03:22:17 +00:00
Joe Fernandez
af99194714 am 003ff78a: am 8e18e016: Wear Landing page fixes
* commit '003ff78a84f2b216660b524fc49665394a339d25':
  Wear Landing page fixes
2014-06-18 03:22:12 +00:00
Jungshik Jang
bce527139a Merge "Add SystemAudioAutoInitiationAction and SystemAudioStatusAction" 2014-06-17 22:26:08 +00:00
Jungshik Jang
187d01765b Add SystemAudioAutoInitiationAction and SystemAudioStatusAction
Once all device discovery action is done if there is audio amplifier
on device list, it should trigger system audio initiation action.
On or off of system audio is decided by Tv's last audio setting
(speaker). If system audio was the last audio setting, it will
try to turn on system audio; otherwise will turn it off.

In other hands, SystemAudioStatusAction is added to update
system audio status (mute or volume) after
SystemAudioAutoInitiationAction. In fact, RequestArcAction has
almost same code as it has and will refactore RequesArcAction
in the following changes.

Change-Id: I3d591242e79549cb73e14546f0d057ba08f878ef
2014-06-18 11:37:11 +09:00