139958 Commits

Author SHA1 Message Date
Christoph Studer
c08cd7cc65 SysUI: Hide grouped notifications
Drop grouped notification received from NoMan.

Bug: 15188947
Change-Id: I8bdb99abd216d771d435d18b2018c843e7750d18
2014-06-17 23:14:12 +00:00
Kristian Monsen
995fabd054 Merge "Always call super when not sending the key event anywhere else" 2014-06-17 21:43:29 +00:00
Jeff Sharkey
65dfc83cef am b9a45aae: am 447b68e7: am b5e05cff: Merge "Fixing parcel leaks to avoid virtual memory leak"
* commit 'b9a45aae8d07e7a92806b53cbc36f5488e3bac2d':
  Fixing parcel leaks to avoid virtual memory leak
2014-06-19 16:17:03 +00:00
Kristian Monsen
83526c181e Always call super when not sending the key event anywhere else
Fix for bug 13171440

Change-Id: I1601e749f0114a6faebcdaeb5ac8993d668b54a8
2014-06-18 18:33:34 -07:00
Jason Sams
47de306050 Merge "Fix element size on 64b" 2014-06-17 21:42:00 +00:00
Jason Sams
b49dfeaea9 Fix element size on 64b
RenderScript Element types know their own size.  This
change properly tracks the new object sizes.

Change-Id: I3cbf76a7ec5f68056ed5599e9406cea05ba86969
2014-06-18 13:17:57 -07:00
John Spurlock
4193730ad8 Merge "Battery saver notifications should be public." 2014-06-17 21:13:21 +00:00
John Spurlock
a0388bb6ff Battery saver notifications should be public.
Bug:15713445
Change-Id: I2ed0e47bcc3120baf85c8529b7ef15756e215ea7
2014-06-18 09:40:00 -04:00
Brian Colonna
a420a330a9 Merge "Added startWithoutUi() call to Face Unlock AIDL interface." 2014-06-17 21:13:21 +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
Yorke Lee
028d64f9ab Merge "Add getSystemPhoneApplication to TelecommManager" 2014-06-17 21:07:42 +00:00
Sreeram Ramachandran
cacf07de41 Merge "Fix the default VPN confirm dialog component name." 2014-06-18 18:28:24 +00:00
Sreeram Ramachandran
ba724e2708 Fix the default VPN confirm dialog component name.
This was a mistake introduced in http://ag/479286.

Bug: 15087985
Change-Id: I09e1cdcbfbe36b322db9b3178324a9ebb7d5e586
2014-06-18 17:32:37 -07:00
Jae Seo
3bbd9be166 Merge "TvContract: Change constants of canonical genres to all-caps values" 2014-06-19 00:17:11 +00:00
Christopher Tate
80888cb206 Merge "Fix job service validation in secondary users" 2014-06-18 19:24:54 +00:00
Christopher Tate
5568f54e14 Fix job service validation in secondary users
Bug 15714663

Change-Id: I101bcc979f30062bec36f462522227b857b58054
2014-06-18 14:02:46 -07:00
Jae Seo
0e33c1286d Merge "TvContract: Add columns for video format and resolution" 2014-06-18 18:28:24 +00:00
Roozbeh Pournader
f1a32d7082 Merge "Add Cherokee, Canadian Aboriginal Syllabics, and Yi fonts." 2014-06-18 18:22:48 +00:00
Roozbeh Pournader
1a8438a8bb Add Cherokee, Canadian Aboriginal Syllabics, and Yi fonts.
Bug: 15708701
Change-Id: I1cdd26798ace5eec24d09b9b5b49eb943edacbe9
2014-06-17 20:21:47 -07:00
Jae Seo
acc1957d78 TvContract: Change constants of canonical genres to all-caps values
This is just for consistency with other constant values.

Change-Id: If226af08e66532c9110bc88e3c68d3958c67cdb6
2014-06-17 19:44:10 -07:00
Jae Seo
68e0de81d5 TvContract: Add columns for video format and resolution
Added COLUMN_VIDEO_FORMAT to the Channels table to indicate typical
video format for programs from a given TV channel, which can later be
used to filter out channels. Also defined common video formats and
resolutions and a utility method to get the video resolution for a given
format.

Added COLUMN_VIDEO_WIDTH and COLUMN_VIDEO_HEIGHT to the Programs table
to indicate the actual video dimension for each individual TV program,
which can be shown as a part of program information by applications.

Bug: 15351111, 15456031
Change-Id: Id72e25de40f06a1b615620365e06cf11e4cd9f81
2014-06-17 19:41:43 -07:00
Christopher Tate
42892f8aa5 Merge "Don't end lock task mode when not in lock task mode" 2014-06-17 21:43:29 +00:00
Christopher Tate
3bd90617ec Don't end lock task mode when not in lock task mode
Change-Id: I3724d68ed7116d47024638d56c5bf43c4866f82e
2014-06-18 16:37:52 -07:00
Winson Chung
c4de2caaaf Merge "Adding start delay to the task view transforms." 2014-06-18 18:28:24 +00:00
Jason Sams
864b75be51 am 3aa4de11: am 802aaf3b: am 47de3060: Merge "Fix element size on 64b"
* commit '3aa4de11b05599d75af92a15820731144941c38f':
  Fix element size on 64b
2014-06-18 23:14:14 +00:00
Jason Monk
ebf55ad6de Merge "Change lock-task DPM authorization to packages" 2014-06-17 21:07:42 +00:00
Kenny Guy
a6685f4e43 Update corp badge assets.
Bug: 15445217
Change-Id: Ie91548625be91272ee684be2c314a9d2e9376b76
2014-06-18 12:23:07 +01:00
Christopher Tate
d9b6d546c3 Merge "Adjust full restore API" 2014-06-17 21:03:08 +00:00
Christopher Tate
5a009f9008 Adjust full restore API
Introduces a new constant, BackupTransport.NO_MORE_DATA, defined to
be -1.  The transport returns this constant when asked for the next
chunk of streaming full restore data to indicate that it has reached
EOF on the current restore target's archive stream.

If the transport returns TRANSPORT_PACKAGE_REJECTED from that same
method, then the OS will abort the current target's restore operation
and move on to the next package in the overall restore dataset (by
calling nextRestorePackage() on the transport).

If the transport returns zero when asked for the next chunk of
restore stream data, this will be interpreted as meaning that no data
is currently deliverable but the restore download is still running
properly; the caller will then retry until either data is delivered
or the transport reports NO_MORE_DATA (or an error).

Also sketched in the implementation of this latest API in the
test LocalTransport.

Bug 15330073

Change-Id: I81621cb322f831460133b7dced5bb88d2a4124e1
2014-06-19 16:18:21 -07:00
Dianne Hackborn
f329d050b8 Merge "Add kernel and native memory data to procstats." 2014-06-19 22:33:55 +00:00
Dianne Hackborn
f7097a5b69 Add kernel and native memory data to procstats.
We now collect memory use data in the kernel and native
application for aggregation in procstats.  This should
allows us to do aggregated summaries of how memory use
is distributed across the system -- how much is free vs.
how much is in use.

Fix a bug in how we were tracking per-app version codes:
apps that used a shared user id to have multiple packages
run in the same process could get their version codes
cross-wired.  Now we keep track of version codes in the
list of packages associated with a process.

Bumped the checkin version code to 5, so that we can
distinguish checkins that have this corrected data.

Also fix a bug in battery stats monitoring radio state.

Change-Id: I1c849f2df442df679a34ad7b0ca0c5870bfac8df
2014-06-19 16:37:23 -07: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
Adam Lesinski
fb421641bf Merge "Fix build break in log statement" 2014-06-17 21:03:08 +00:00
Adam Lesinski
fb600d60c0 Fix build break in log statement
For logging purposes, a uint32_t was being converted into
a void pointer, which on certain systems would be a conversion
to a different size.

Change-Id: I90af69ab975d84c9c8cbb1cce94ff4e9cc6edcf2
2014-06-18 13:00:28 -07: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
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
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