139870 Commits

Author SHA1 Message Date
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
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
Mark Renouf
f2dcb39044 Merge "Limit swipe dismiss progress to positive values" into klp-modular-dev 2014-06-17 21:03:08 +00:00
Mark Renouf
6c5c48a8b0 Limit swipe dismiss progress to positive values
BUG: 15716749

Change-Id: Ibd6daa1a515611e5c9b8a02c6df75130aa8c093b
2014-06-18 16:08:06 +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
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
Wink Saville
b576cec262 Merge "Empty triangle displayed for radio signal but calls & data work" 2014-06-17 21:03:08 +00:00
Wink Saville
eeacf93747 Empty triangle displayed for radio signal but calls & data work
TelephonyRegistry: when default sub id is requested set isLegacyApp to
true so when ACTION_DEFAULT_SUBSCRIPTION_CHANGED is received the
TelephonyRegistry.Record.subId will be updated.

SubInfoRecord: Add SubInfoRecord toString for easier debugging

SubscriptionManager: Add putPHoneIdAndSubIdExtra(intent, phoneId, subId)
as this allows explicit setup of phoneId and subId and does not rely on
a phone's subId being set.

Bug: 15669560
Change-Id: I645ddb35b964b08dcb46f881c9d02b932d128950
2014-06-18 01:07:10 -07: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
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
Derek Sollenberger
bc8bd76bc7 Merge "Refactor android.graphics.Picture JNI bindings." 2014-06-17 21:13:21 +00: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
Robert Ly
95df0762c4 Merge "docs: Edits to the L Preview API overview." into klp-modular-dev 2014-06-17 20:55:27 +00:00
Andrew Solovay
68990cf8a6 docs: Edits to the L Preview API overview.
Also added a screenshot of the new "Battery Historian" tool and
screenshots showing managed vs unmanaged apps in the "Launcher"
screen (all screenshots in regular and "2x" size).

This version of the doc is staged to:

http://asolovay.mtv:9111/preview/api-overview.html

Change-Id: I09d2b11a01edacef2800f80ab93823f1a2c44478
2014-06-17 17:20:07 -07:00
Robert Ly
b5d79bd2ab Merge "Android TV Landing Page" into klp-modular-dev 2014-06-17 20:55:27 +00:00
Joe Fernandez
ef14f0344c Android TV Landing Page
Change-Id: I22eae7a06b877884340b4611acd673ac84f6086f
2014-06-17 19:17:08 -07:00
Stephen Hines
6b605045b1 Merge "Switch from Droid -> Noto for RS fonts." 2014-06-17 20:55:27 +00:00
Jeff Sharkey
8fb63d5a5a Merge "Plumb split APKs into public API." 2014-06-17 20:55:27 +00:00
Christoph Studer
5ced68ba2f am cf24e6de: SysUI: Hide grouped notifications
* commit 'cf24e6de68cff14970e57069febd5d6c41c264f4':
  SysUI: Hide grouped notifications
2014-06-17 23:20:54 +00:00
Jeff Sharkey
8a4c9721a9 Plumb split APKs into public API.
Introduces new ApplicationInfo fields to surface zero or more split
APKs for an application.  Splice these APKs into both the class
loader and resource system.  Cleaner building of these paths.

Run dexopt() on all split APKs found after a parse, and populate
into ApplicationInfo.

Change-Id: I4a376bf4492d84ea95aafa866e106ea43a43e492
2014-06-17 14:38:44 -07:00
Jim Miller
05d38d28b6 Merge "Hide IFingerprintService and IFingerprintServiceReceiver" 2014-06-17 20:55:27 +00:00
Jim Miller
06e658f324 Hide IFingerprintService and IFingerprintServiceReceiver
The @hide was being ignored because they were being used by the
constructor.  Fixed by making the FingerprintManager constructor
hidden.

Change-Id: I3cd409df5055579f5004b08d00d5d951b8e5afd3
2014-06-17 18:38:14 -07:00
Jeff Brown
2139276ce8 Refactor BatteryService to new pattern.
Apply SystemService pattern to BatteryService.

Change-Id: I4971b2da8d2aed4d14440fb65863a8b916bab03c
2014-06-17 18:20:42 -07:00
Jeff Brown
2c43c339de Resolve boot time dependencies related to the power manager.
This change fixes a bug where native daemons may try to communicate
with the power manager before it was fully initialized due to a race
between publishing the binder service and completing init().

The solution was to simplify the dependencies related to the power
manager.  It turns out that most services that were passed in
init are not actually needed until systemReady.  What remained
was a dependency on the activity manager to check permissions for
incoming calls.  So now we start activity manager first.
However, the activity manager also depends on power manager for
wakelocks.  To break the cycle, we now defer initializing the activity
manager's wakelocks until after the power manager has been started.

Cleaned up a bunch of boot-time service dependencies so that we
can have better confidence that they are correctly maintained.

Bug: 13884219
Change-Id: If08e2d7ccd44e7026a72441bb6bd5afd7bb9fffe
2014-06-17 18:20:42 -07:00
Jim Miller
cd589baba9 Merge "First pass at FingerprintService integration with HAL. Move FingerprintService to framework services directory Fix merge conflicts." 2014-06-17 21:07:42 +00:00
Jim Miller
a7596147b4 First pass at FingerprintService integration with HAL.
Move FingerprintService to framework services directory
Fix merge conflicts.

Tested: scanning, enrolling, removing.

Change-Id: I58b2b902cb671dc82cdaa54a195ba5f1a154622c
2014-06-17 14:03:37 -07:00
Christopher Tate
564054146e Merge "Tweak restore API" 2014-06-17 20:55:27 +00:00
Christopher Tate
6a49dd087f Tweak restore API
We need the transport to tell the system not only what package it's going
to deliver data for next, but also what format that data is in.

Change-Id: I989cf78febf923a4208acb33ed80ccc7869356f5
2014-06-17 14:29:09 -07:00
David Christie
3afc6fa0a0 Merge "Update Location documentation for altitude (WGS84 instead of sea level)." 2014-06-17 20:49:29 +00:00
Griff Hazen
f546eeb1ed Merge "DO NOT MERGE Reduce chance of notification listener dropped messages." into klp-modular-dev 2014-06-17 20:49:29 +00:00
Griff Hazen
2ea0d3979e DO NOT MERGE Reduce chance of notification listener dropped messages.
The existing code for notification manager/listeners uses a oneway
binder api to deliver messages. One problem with this is that
notification objects can sometimes get fairly large, and can bump
into the oneway binder transaction buffer if many happen at once.

To reduce this issue, flip the service into a oneway delivery of
a status bar notification holder, whose wrapped content is then
immediately fetched upon receipt of the one-way message. This moves
the meat of the fetch to be over a two-way interface without changing
the properties of which object is actually sent (a tickle solution
with lookup key would have changed this)

Further research: attempt to chunk notification objects themselves.
They can sometimes transfer hundreds of KB over a binder transaction.

Bug: 15426276
Change-Id: Ib1a1f4ff848c16f80bcf2ae4dfd2b87a9091f0b2
2014-06-17 20:06:45 -07:00
Andy McFadden
50b9fcfae1 Merge "Add two new display info fields" 2014-06-17 20:49:29 +00:00
Ihab Awad
87161a7667 Merge "Add methods to TelephonyManager for Subscription management (1/3)" 2014-06-17 20:49:29 +00:00
Ruben Brunk
441aea7719 Merge "camera2: Adding legacy mode support for teeing to Video." 2014-06-17 22:59:52 +00:00
Colin Cross
7e31bb6c76 am 0ead2a00: am 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"
* commit '0ead2a00f4eebb36c2c1206e156fbf1543ee0dd6':
  Fix reading memory usage for 64-bit processes
2014-06-17 22:56:49 +00:00
Ruben Brunk
d85e1a6ced camera2: Adding legacy mode support for teeing to Video.
Bug: 15116722

- Select intermediate GL texture size based on available
  preview dimensions.
- Fixes for configure deadlock.
- Fixes for jpeg capture.

Change-Id: I3f665230defdad718de40494dd67fda5ea432bfb
2014-06-17 22:56:36 +00:00
Ihab Awad
c35ad0252d Add methods to TelephonyManager for Subscription management (1/3)
As part of the effort to permit third-party suppliers of telephone
connectivity, we permit clients of TelephonyManager to obtain the
currently valid Subscription objects describing these suppliers. The
Subscriptions are intended to be self-describing such that an end-user
can choose from among them based on the information they contain. One
of these objects may then be attached to an ACTION_DIAL or ACTION_CALL
Intent to represent the end-user's choice of how to make a call.

Change-Id: I2ad1930079042d7bfe762b47c22f0538f7403bff

Conflicts:
	telephony/java/com/android/internal/telephony/ITelephony.aidl

Conflicts:
	telecomm/java/com/android/internal/telecomm/ITelecommService.aidl
2014-06-17 15:08:13 -07:00
Wonsik Kim
94cdec6e98 Merge "TvInputHardwareManager: Fix Integer conversion error" 2014-06-17 20:49:29 +00:00
Wonsik Kim
e7ae0ce53b TvInputHardwareManager: Fix Integer conversion error
Change-Id: Ice85ef840dd7fa40faaf2fdfa359ee419d3a36e8
2014-06-19 00:48:35 +09:00