142388 Commits

Author SHA1 Message Date
Chong Zhang
94686d13ca MediaCodec: change onError cb to send CodecException
Bug: 11990118
Change-Id: I8b6112f126c2f473f64e2aad6ffcfbc3f1d6e64a
2014-07-11 19:42:55 -07:00
Winson Chung
d336042f7a Merge "Adding missing passthrough of task affiliate id." 2014-07-11 16:34:41 +00:00
Winson Chung
8236f525f9 Adding missing passthrough of task affiliate id.
Change-Id: Ied2997418ae4c17d0d130c9e6434c0e6e645da41
2014-07-11 19:24:15 -07:00
Winson Chung
305addefcd Piping through task affiliation to Recents. 2014-07-11 19:15:17 -07:00
Winson Chung
5f1970cc4d Merge "Piping through task affiliation to Recents." 2014-07-11 23:25:18 +00:00
Yuncheol Heo
a0c4a06ba3 Add the system feature for HDMI-CEC.
Change-Id: I2a985cedf49d50649c89f2ac5fbb80a81300156d
2014-07-12 11:13:48 +09:00
Chris Craik
a5d98da691 Merge "Disable setOutline() functionality, pending full removal" 2014-07-11 21:38:19 +00:00
Chris Craik
7b7ca3cdf2 Disable setOutline() functionality, pending full removal
bug:15283203
Change-Id: Ibf127fecfcda835117c6087180c64f622b3041e4
2014-07-11 19:02:28 -07:00
Lajos Molnar
d4023114e8 MediaCodec: add new buffer and format APIs
Bug: 14562236
Bug: 14297827
Bug: 13008204
Bug: 10706245
Bug: 10672559
Bug: 9175531

Change-Id: Ia94d34f625e532619a9ed344eb27e0d26647982f
2014-07-12 01:43:56 +00:00
Sreeram Ramachandran
06b6cdaed5 Remove unnecessary code and APIs.
This stuff has been replaced by setNetworkForUser() in NetdClient.

Change-Id: If525ee259b74314191d1913f7c2a3e828e05c38f
2014-07-11 18:16:04 -07:00
Robert Shih
464da703ca MediaPlayer: added getSelectedTrack
Change-Id: Ic39b9b3d5e72e13452320a0272deb489a0285913
2014-07-10 20:32:37 -07:00
Adam Powell
2ecfcd9b23 Merge "Correctly set the window callback for ToolbarActionBar" 2014-07-10 20:49:26 +00:00
Adam Powell
b40484bb30 Correctly set the window callback for ToolbarActionBar
Bug 16134781

Change-Id: I88ec0c2b5dc23767ab0f198ab26601fd46b95628
2014-07-11 17:17:33 -07:00
Winson Chung
1f24c7e37b Initial changes to support lock-to-app on the foremost task. (Bug 16221876) 2014-07-12 00:10:11 +00:00
Dianne Hackborn
3c58775a12 Merge "Allow INTERACT_ACROSS_USERS for service access." 2014-07-10 20:49:26 +00:00
Ricardo Cervera
782fb750cc am 2ab3040e: am 908d35e7: am f4d498f1: Merge "docs: Release notes for support lib v20" into klp-modular-dev
* commit '2ab3040ed0a5d18e65e5db3c2b960fcc7541cddd':
2014-07-11 17:38:20 +00:00
Quddus Chong
35ab002b2d am 703b32d6: am 1656fb8c: am 9a3dd19d: docs: Fixed angle bracket typo for task locking command line instructions. bug: 16153312
* commit '703b32d6e58b161b0e4df5f6570e130e4c2d3aff':
2014-07-11 17:38:16 +00:00
Robert Greenwalt
1ddf048be8 am 231f2ac7: am ca19b7cb: am a7efe9b8: am 912700fc: Merge "Add Telefonica/Movistar specific APN details for dun"
* commit '231f2ac7bfb4c0444f2cc12b3e85fb9d1e15caee':
2014-07-11 17:38:12 +00:00
Winson Chung
083baf99ff Fixing a few potential crashes, preparing for Task affiliations framework changes.
- Deferring widget host listening to speed up startup
- Ensuring that we animate to the right task position in the stack and not just the front-most
- Removing assumption that we can only get screenshots for the most recent task
2014-07-11 17:36:57 +00:00
Makoto Onuki
a2295e65dc Enterprise caller-id: framework/base/Telephony
It's basically equivalent to http://ag/500455 and http://ag/499160.

Now "Send to voicemail" and the missed call notification uses the enterprise
lookup; they now work with a corp contact too.

Bug 15779911

Change-Id: I8a87f45ba7299cfbc516eb44326e02258e38cf63
2014-07-11 17:34:55 +00:00
Dianne Hackborn
409297da18 Allow INTERACT_ACROSS_USERS for service access.
But only if the two users are in the same profile.  Also
apply the same rule for the recently allowed interaction
across content providers.

The activity manager now keeps track of which users are in
the same profile group, and the handleIncomingUser function has
an option to allow a non-full caller to do the interaction
if the two users are in the same profile group.

Spread this joy all over the place.

Also turn off multi-user on Svelte devices.

Change-Id: I231484ea2a6bfccbb3cd51357d7a387bd75039ea
2014-07-11 10:30:04 -07:00
Ricardo Cervera
2c67ff30f0 am 908d35e7: am f4d498f1: Merge "docs: Release notes for support lib v20" into klp-modular-dev
* commit '908d35e79eb457f9fe5cecc33951ca68d2f80e30':
  docs: Release notes for support lib v20
2014-07-11 16:19:29 +00:00
Quddus Chong
f60a64754d am 1656fb8c: am 9a3dd19d: docs: Fixed angle bracket typo for task locking command line instructions. bug: 16153312
* commit '1656fb8cc74d56870c772c048fd479268fdfbb48':
  docs: Fixed angle bracket typo for task locking command line instructions. bug: 16153312
2014-07-11 16:19:21 +00:00
Robert Greenwalt
41d72dbe62 am ca19b7cb: am a7efe9b8: am 912700fc: Merge "Add Telefonica/Movistar specific APN details for dun"
* commit 'ca19b7cbdfadb50f578fd688bec18a3fc34d98cd':
  Add Telefonica/Movistar specific APN details for dun
2014-07-11 16:19:16 +00:00
Deepanshu Gupta
e00c0c672e Merge "LayoutLib: Fix System.arraycopy()" 2014-07-10 21:09:47 +00:00
Deepanshu Gupta
e1960cc0b5 LayoutLib: Fix System.arraycopy()
Framework has specialized versions of java.lang.System.arraycopy() for
all primitive data types. These versions are not present on the Desktop
VM. This change replaces calls to any of the specialized versions with
the more general alternative - the one using Objects.

Note that this was already being done for char.

Change-Id: If1584125fea8ecc080fb39a5ee6cdb4d922d0c98
2014-07-11 10:27:36 -07:00
Robert Greenwalt
b36cd2dccf Merge "Readjust location of NETID_UNSET definition." 2014-07-10 21:09:47 +00:00
Paul Jensen
5d59e785e1 Readjust location of NETID_UNSET definition.
This is a tweak to my 8ec11bb change I a-little-too-hastily committed.

Change-Id: Ibeee9382109994c66227d1c42aac749e2a274ed7
2014-07-11 16:53:39 +00:00
Erik Pasternak
b9731a1026 Merge "Revert "Make PlaybackState immutable with a builder"" 2014-07-10 20:43:36 +00:00
Erik Pasternak
b2e93efcac Revert "Make PlaybackState immutable with a builder"
Will resubmit tomorrow for Build Breakage Friday as this change needs new SDK prebuilts for unbundled app branches.

This reverts commit aa746b27610680a2c0fbdf7d81a6455c4597f05e.

Change-Id: I28ba7e1b09234a5eb1b725aed043b9de98e1bc16
2014-07-10 22:51:34 +00:00
Ashish Sharma
cba1215412 Correctly attribute User Activity to the uid in checkin batterystats.
Change-Id: Iacca5985c0b5a68026da6b2b5c9607f8cb71aad5
2014-07-10 22:45:22 +00:00
RoboErik
5a4e011143 Make PlaybackState immutable with a builder
bug:15862252
Change-Id: I8944b7753cd6a36a74b0091f71a386f77040c4ab
2014-07-10 22:39:03 +00:00
Jinsuk Kim
b3d91779cb Global system settings for HdmidControlService
HDMI CEC/MHL related settings. All the settings are hidden, to be used
by the service and settings UI.

Change-Id: I1113aa5f77189db73acfa5fe36670a3cd621b1c1
2014-07-10 22:34:11 +00:00
John Spurlock
136c5ae2ce Merge "Volume: Promote alarm warning to title." 2014-07-10 21:28:08 +00:00
John Spurlock
86d04fdaa1 Volume: Promote alarm warning to title.
Bug:16211556
Change-Id: I839e08d1ba26ba825a9799f92c9b600feb91a81b
2014-07-10 18:37:45 -04:00
ztenghui
4239469bc5 Merge "Fix the render order to follow the XML file order." 2014-07-10 20:49:26 +00:00
ztenghui
8d0d24f7a2 Fix the render order to follow the XML file order.
So we put path and group into a big list, then use reflectiont to handle them
differently.

bug:16162141

Change-Id: I4c84dc952d5d9b49412301dcd6459395e21d3b31
2014-07-10 22:04:20 +00:00
Andres Morales
ef6a8cc008 Updating strings to make them more clear for TC
Bug: 15893731
Change-Id: Ib6f5591322e76a35336a62a93863c13363e30dba
2014-07-10 15:03:01 -07:00
Jinsuk Kim
17db3b8cf7 Merge "Support HdmiControlService.sendKeyEvent for both TV/playback device" 2014-07-10 21:43:01 +00:00
Jinsuk Kim
c068bb5a04 Support HdmiControlService.sendKeyEvent for both TV/playback device
Added another parameter deviceType for HdmiControlService to
run the specified local device for sendKeyEvent.

Bug: 15844076
Change-Id: I598ef320ae94bba0ace38701ae0ca12fd0625559
2014-07-11 06:59:26 +09:00
Robert Greenwalt
9297bfb850 Merge "Missed an entry in the copy constructor." 2014-07-10 21:02:07 +00:00
Robert Greenwalt
94badcc8ce Missed an entry in the copy constructor.
bug:15755597
Change-Id: Iee17ca88404a6a50258d204a12cd0c04cd15e34e
2014-07-10 14:55:14 -07:00
Jon Miranda
a008ea670b Merge "Exposes more properties to assist in evaluating contrast ratios." 2014-07-10 20:54:59 +00:00
Jon Miranda
a25dc428db Exposes more properties to assist in evaluating contrast ratios.
Change-Id: I43468df4d842e03001ab33e139095afadaeacd20
2014-07-10 21:35:22 +00:00
Jeff Sharkey
355319f782 Merge "Always derive native library paths at runtime." 2014-07-10 20:30:05 +00:00
Jeff Sharkey
84f1294a95 Always derive native library paths at runtime.
Over time, we've unpacked native libraries at various places with
respect to their source APK.  Persisting this path in PackageSettings
has caused more pain recently with the switch to supporting multiArch
and cluster installs.

This change switches us to always derive the native library paths at
runtime based on the type of install.  This also ensures that
transitioning between a bundled system app and an upgraded system
app will always build the right path.

We still persist the last generated path into PackageSettings to make
cleanup at uninstall time easier.

Bug: 16208505, 16206748, 16212206
Change-Id: Ieb82a424ca4a92b5674983453c50ba4b695abfb0
2014-07-10 18:38:39 -07:00
dcashman
78311f3652 Merge "Change key-set/public-key manifest relationship." 2014-07-10 21:21:20 +00:00
dcashman
989eb371bf Change key-set/public-key manifest relationship.
Separate definition of public keys and keysets in the manifest to better
represent their relationship. The 'key-set' tags should have nested additional
'public-key' tags that indicate which of the defined 'public-key' tags are
associated with them.  The first use of a given 'public-key' name should define
its value; subsequent uses may refer to it only by name.  'key-set' and
'public-key' names may not intersect.

Also, change 'keys' tag to 'key-sets' to avoid issues with previous keysets
implementation.

Bug: 6967056
Change-Id: I7534e4a42326e97b67b55509187c0d3c21a2bb32
2014-07-10 18:23:11 -07:00
Svetoslav
0c126a478b Fix print document with zero pages backwards compatibility.
Historically, we were allowing an app that prints to specify that
the printed document has zero pages. While this does not make any
sense we should keep the behavior as people may have apps that do
that. This change fixes this issue and now we treat zero the same
way as undefined page count and ask the app to write all pages to
check the written PDF for the page count.

bug:16199127

Change-Id: I4e7de66b669e9f783db0252244a6c1e5b24ffe28
2014-07-11 00:43:28 +00:00
John Spurlock
32618191f6 Merge "Volume: Elide collapsed condition title if no end." 2014-07-10 21:35:02 +00:00