OSDN Git Service
Jean-Michel Trivi [Thu, 23 Jul 2015 17:53:37 +0000 (10:53 -0700)]
MediaPlayer subtitle controller: use debug log instead of warning
Don't use warning log for debug message.
Bug
22698299
Change-Id: Ibe3526fffffc9a7bdcda83c02fd745325db1238b
Alex Klyubin [Thu, 23 Jul 2015 16:23:59 +0000 (16:23 +0000)]
Merge "Document what algorithms Android Keystore supports." into mnc-dev
Junda Liu [Thu, 23 Jul 2015 16:20:35 +0000 (16:20 +0000)]
Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev
Jean-Michel Trivi [Thu, 23 Jul 2015 15:59:20 +0000 (15:59 +0000)]
Merge "RingtoneManager: query results depend on caller permission" into mnc-dev
Jack Yu [Thu, 23 Jul 2015 15:51:13 +0000 (15:51 +0000)]
Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev
Geoff Mendal [Thu, 23 Jul 2015 07:28:45 +0000 (00:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: If02d6e590724181954e4b3f890f1fd5a132f392d
Auto-generated-cl: translation import
Jack Yu [Wed, 22 Jul 2015 20:36:42 +0000 (13:36 -0700)]
Allow carriers to force disable ETWS/CMAS test messages.
This feature can be enabled in carrier config XML. When enabled, the user will not see
ETWS/CMAS enable/disable option in emergency broadcast preference menu.
bug:
22396039
Change-Id: I6ad6fa39852d3b13faeef968a1963b3e0a4a6e61
Nick Kralevich [Thu, 23 Jul 2015 01:46:38 +0000 (01:46 +0000)]
Merge "Revert "UsbDeviceManager: fix b/
21429947 regression"" into mnc-dev
Nick Kralevich [Thu, 23 Jul 2015 01:43:23 +0000 (01:43 +0000)]
Revert "UsbDeviceManager: fix b/
21429947 regression"
This causes various problems with our testing infrastructure.
This reverts commit
b210026e3d5c955628ca8b8b9191ade08891e9ef.
Bug:
22447614
Bug:
21429947
Change-Id: I57623e3d993e65b6ad89e7a7d28e9575cf638994
Svetoslav Ganov [Thu, 23 Jul 2015 01:13:24 +0000 (01:13 +0000)]
Merge "Grant record audio to system reco service by default" into mnc-dev
Adam Lesinski [Thu, 23 Jul 2015 01:01:22 +0000 (01:01 +0000)]
Merge "UsageStats: Reduce log spam during time change" into mnc-dev
Dianne Hackborn [Thu, 23 Jul 2015 00:56:19 +0000 (00:56 +0000)]
Merge "Fix issue #
22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev
Adrian Roos [Thu, 23 Jul 2015 00:50:55 +0000 (00:50 +0000)]
Merge "Fix cut off charging indication in certain scripts" into mnc-dev
Adam Lesinski [Thu, 23 Jul 2015 00:23:40 +0000 (17:23 -0700)]
UsageStats: Reduce log spam during time change
With lots of usage stats files, the log gets spammy
when the time changes and we are moving files around.
Bug:
22549399
Change-Id: I9da39399b090066d52568dea6fc5b59aba063c5a
Svetoslav [Thu, 23 Jul 2015 00:34:12 +0000 (17:34 -0700)]
Grant record audio to system reco service by default
bug:
22668415
Change-Id: I0fec7cc671bb1cc3a13b870748fc8e110a11250e
Dianne Hackborn [Thu, 23 Jul 2015 00:35:34 +0000 (00:35 +0000)]
Merge "Fix issue #
22653116: Google App crashing on NYT app" into mnc-dev
Svetoslav Ganov [Thu, 23 Jul 2015 00:27:16 +0000 (00:27 +0000)]
Merge "Do not show normal permissions in sideloading UI" into mnc-dev
Dianne Hackborn [Thu, 23 Jul 2015 00:20:33 +0000 (17:20 -0700)]
Fix issue #
22414729: Checkin start clock time is different from hsitory reset time
There was a mistake in the code that was supposed to recover from the
initial time on a new device being bad until the real time ultimately
gets set, which was causing us to update the start clock time every time
there was a time change (instead of just when the original start time
appears bad).
Rework all of this, so we now count the start time as bad if it is more
than one year before the current time, only modifying it in that case.
Also when modifying it, adjust the time we set it to take in to account
how much realtime has actually elapsed so far in the battery stats.
Change-Id: If74bd711d9b7618c8f6148a9935c452aaaa7e257
Svetoslav [Thu, 23 Jul 2015 00:02:46 +0000 (17:02 -0700)]
Do not show normal permissions in sideloading UI
bug:
22627493
Change-Id: I5bb900bb2cd68893c21d9e9b2c973d331d355b58
Dianne Hackborn [Thu, 23 Jul 2015 00:02:10 +0000 (17:02 -0700)]
Fix issue #
22653116: Google App crashing on NYT app
We weren't correctly handling the root view of the window --
we were just pushing it on to the stack, but that means it got
written at the end. Instead, we now immediately write it
after the window and let things follow from there.
Change-Id: I070c96bd2443f312a7c6f495d1bf72fa19c614d6
Fyodor Kupolov [Wed, 22 Jul 2015 23:57:00 +0000 (23:57 +0000)]
Merge "Fixed a typo" into mnc-dev
Adam Lesinski [Wed, 22 Jul 2015 23:41:39 +0000 (23:41 +0000)]
Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev
Adrian Roos [Wed, 22 Jul 2015 23:10:09 +0000 (23:10 +0000)]
Merge "Protect demo mode commands with permission" into mnc-dev
Adam Lesinski [Wed, 22 Jul 2015 23:01:45 +0000 (16:01 -0700)]
UsageStats: Gracefully handle corrupt filenames
Not sure how useful this is, since renames should be atomic. If the filesystem
is corrupt I'm sure other parts of the system will break. Good to be safe though!
Bug:
22172659
Change-Id: Iad339be2869d170bcf736c59feb93830a51905e1
Jean-Michel Trivi [Wed, 22 Jul 2015 17:55:02 +0000 (10:55 -0700)]
RingtoneManager: query results depend on caller permission
When querying for ringtones, only look for ringtones on external
storage when the caller has READ_EXTERNAL_STORAGE.
Document this behavior in the javadoc of the affected methods.
Bug
22545684
Change-Id: Iae9c9a4ccaf635da8af2ac289b6b4df1b16c5d11
Fyodor Kupolov [Wed, 22 Jul 2015 22:24:46 +0000 (15:24 -0700)]
Fixed a typo
Change-Id: I85d75429baed3263c04e747eb374c66177c064f5
Jae Seo [Wed, 22 Jul 2015 22:22:32 +0000 (22:22 +0000)]
Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev
Svetoslav Ganov [Wed, 22 Jul 2015 21:41:40 +0000 (21:41 +0000)]
Merge "Add a privileged permission to get user accounts" into mnc-dev
John Reck [Wed, 22 Jul 2015 21:29:55 +0000 (21:29 +0000)]
Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev
Adam Lesinski [Wed, 22 Jul 2015 21:28:37 +0000 (21:28 +0000)]
Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev
Nick Kralevich [Wed, 22 Jul 2015 21:18:59 +0000 (21:18 +0000)]
Merge "UsbDeviceManager: fix b/
21429947 regression" into mnc-dev
Chris Wren [Wed, 22 Jul 2015 21:18:40 +0000 (21:18 +0000)]
Merge "Don't crash sysui when advisory calls fail." into mnc-dev
Chris Wren [Wed, 22 Jul 2015 21:03:17 +0000 (17:03 -0400)]
Don't crash sysui when advisory calls fail.
Bug:
22653721
Change-Id: I8e2fc3887b7c71f99eb02306ce308f722dba4d07
John Reck [Wed, 22 Jul 2015 20:55:48 +0000 (13:55 -0700)]
Fix ATLAS_MAP_ENTRY_FIELD_COUNT
Bug:
22558805
Change
a039182d6157bc0487df4ad8e373685c9dd7d662 reduced
the size of an entry from 4 fields to 3, but failed to
update the constant that determined the size of the java long[].
Because the long[] is blindly passed down through to native, this
will result in reading past the end of the array as the size
is no longer a multiple of the number of fields being read so
the loop will not terminate until 1 iteration past the end.
Change-Id: I2f8e26cec9a60b3a74739a3763203296be5f1fd6
Adam Lesinski [Wed, 22 Jul 2015 20:50:23 +0000 (13:50 -0700)]
BatteryStats: Use English locale for dump and checkin data
Dump and checkin data is read by tools that expect a consistent
locale.
Bug:
22357316
Change-Id: I0d7e6e771c3512278efca7579fe9c4b79b560e28
Tim Kilbourn [Wed, 22 Jul 2015 20:40:06 +0000 (20:40 +0000)]
Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev
Alan Viverette [Wed, 22 Jul 2015 20:35:40 +0000 (20:35 +0000)]
Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev
Fyodor Kupolov [Wed, 22 Jul 2015 20:27:06 +0000 (20:27 +0000)]
Merge "Added a note about location permission" into mnc-dev
Nick Kralevich [Wed, 22 Jul 2015 19:59:47 +0000 (12:59 -0700)]
UsbDeviceManager: fix b/
21429947 regression
As discussed in b/
21429947 (commit
674019065bceb4150190bfb1aa63cda9de0a8560), MTP must always be
enabled, even if access to the underlying MTP data is disabled.
Otherwise, Android will not enumerate on the USB bus, and won't
receive notifications from the kernel about USB state changes. This
effectively prevents using MTP functionality on user builds, or
on userdebug/eng builds with adb turned off.
Always ensure that MTP is the default driver mode.
Get rid of one use of the persistent property. The persistent property
was already pulled from a number of devices, and as explained in
commit
fcf10f7c12cb3107bdfedce6f76a8c866d154f3c, the intent was that
the persistent property would only hold the persistent adb state.
Bug:
22447614
Bug:
21429947
Change-Id: I8b3690a1bafb7cea0d5a69d73c1065c7fc64c653
xin He [Wed, 22 Jul 2015 19:47:53 +0000 (19:47 +0000)]
Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev
Jeff Sharkey [Wed, 22 Jul 2015 19:40:44 +0000 (19:40 +0000)]
Merge "More info to support CTS, fix reconcile bug." into mnc-dev
Alan Viverette [Wed, 22 Jul 2015 19:37:14 +0000 (15:37 -0400)]
Fix handling of RelativeLayout measurement using UNSPECIFIED spec
Bug:
22613599
Change-Id: Ibdac9de1d5b53a46b29ae916e5dcc8b5c4bc9c27
Jae Seo [Wed, 22 Jul 2015 07:14:08 +0000 (00:14 -0700)]
TIF: Enable hardware acceleration on overlay
Bug:
18162541
Change-Id: If57fb26ae88ca6ef701f01cce0e5dfd9c6eb1f0e
Jason Monk [Wed, 22 Jul 2015 19:29:59 +0000 (19:29 +0000)]
Merge changes from topic 'TunerLoc' into mnc-dev
* changes:
Add metrics to tuner
Move tuner enable point to QS
Junda Liu [Wed, 22 Jul 2015 19:21:54 +0000 (12:21 -0700)]
Remove volte_feature_disabled as carrier config handled it.
Bug: b/
22602876
Change-Id: Ib1948c93eae6b563846563f1353bab24c4c687a0
Jorim Jaggi [Wed, 22 Jul 2015 00:24:46 +0000 (17:24 -0700)]
Partially fix that beginning of animation is skipped
When waiting for all the windows that belong to an activity, we
skipped the main window, in case it didn't had a surface yet. This
was a problem because with SurfaceViews: They set it's visibility
extremely early in the app visibility change cycle. Then, they don't
block with the callback to SurfaceHolder.Callback2.surfaceRedrawNeeded,
so window manager thinks it has drawn the first frame already. We don't
even have a surface for the main window yet, but we start the app
transition already because we think the only interesting window for this
app token is the SurfaceView, which has supposedly already drawn.
Bug:
22207948
Change-Id: I2ddb274000fa08866e193f4fd8db3788fc55e0f1
Adrian Roos [Wed, 22 Jul 2015 19:17:43 +0000 (12:17 -0700)]
Fix cut off charging indication in certain scripts
Bug:
22620003
Change-Id: Ib9d8eb4bb0442db86c35374435086e04e71742d7
Alex Klyubin [Wed, 22 Jul 2015 19:03:19 +0000 (12:03 -0700)]
Document what algorithms Android Keystore supports.
This updates the Android platform SDK documentation to list which
algorithms are supported by Android Keystore on which Android
platforms.
The list is similar in design to the one in SSLSocket and SSLEngine.
Bug:
22661043
Change-Id: I08fcf65ca58ead644100b673dceb93c67f34f507
Dianne Hackborn [Wed, 22 Jul 2015 19:04:00 +0000 (19:04 +0000)]
Merge "Fix issue #
22612630: Ensure SMS/Call delivery during Doze" into mnc-dev
Jason Monk [Thu, 16 Jul 2015 18:15:50 +0000 (14:15 -0400)]
Add metrics to tuner
Bug:
22462605
Change-Id: I075f9a25630a89e85dd17603297565988c38075b
Jason Monk [Thu, 16 Jul 2015 12:58:15 +0000 (08:58 -0400)]
Move tuner enable point to QS
Long clicking on settings gear in QS causes it to accelarate and
spin, when released it will open and enable the tuner. On first
opening there will be a warning dialog.
Also add way to disable tuner from tuner screen. This way it can
be removed from its former home in Developer Settings. All tuner
settings are reset when disabled to match developer settings
behavior.
Bug:
22462605
Change-Id: Ie700a6a15e6c3caccf7cd1885da73328e6fac6ab
Jeff Sharkey [Wed, 22 Jul 2015 18:11:46 +0000 (11:11 -0700)]
More info to support CTS, fix reconcile bug.
Surface more details and commands for storage volumes to support
CTS testing. Fix user reconciliation bug that skipped user setup on
empty volumes.
Bug:
22658804,
22633097
Change-Id: I4221312d1cce24d1f5a2c108095cf3cf471598ed
Fred Chung [Wed, 22 Jul 2015 17:46:21 +0000 (17:46 +0000)]
am
2c3b9fb8: am
3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs
* commit '
2c3b9fb86b9fb26b01fe5af2067f6513bf06acf3':
Doc change: add note about not exiting on onPause().
wang.zhenyu [Sat, 4 Jul 2015 09:00:16 +0000 (17:00 +0800)]
Miss USB device Interface from UsbManager.getDeviceList().
In the scenario that you connect more than one device to android phone
with an usb hub, when you attach the second device,mNewConfigurationis
is still corresponded to the first device unless another
mNewConfiguration is created by a new operation. However,before another
mNewConfiguration is created,setInterfaces() in addUsbConfiguration()
has already been executed. Problem is that mNewInterfaces has already
been cleared when it finished endUsbDeviceAdded for the first device. As
a result,the UsbInterface descriptor in the first device's Configuration
descriptor is set to null.
Bug:
22657587
Change-Id: I0ba4f07c809d07ebebed633e43c3ee8e2e4c5060
Dianne Hackborn [Wed, 22 Jul 2015 16:14:59 +0000 (16:14 +0000)]
Merge "Work on issue #
22303510: Additional permissions aren't properly..." into mnc-dev
Alex Klyubin [Wed, 22 Jul 2015 15:24:27 +0000 (15:24 +0000)]
Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev
Wale Ogunwale [Wed, 22 Jul 2015 14:21:31 +0000 (14:21 +0000)]
Merge "Fixed issue with not finding existing activity for background user" into mnc-dev
Kenny Guy [Wed, 22 Jul 2015 13:49:20 +0000 (13:49 +0000)]
Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev
Jason Monk [Wed, 22 Jul 2015 12:56:40 +0000 (12:56 +0000)]
Merge "Fix blank tiles on QS rotate" into mnc-dev
Jason Monk [Wed, 22 Jul 2015 12:54:20 +0000 (12:54 +0000)]
Merge "Fix crash in NetworkControllerImpl" into mnc-dev
Jim Miller [Tue, 21 Jul 2015 23:58:46 +0000 (16:58 -0700)]
Make FingerprintService more tolerant of fingerprintd crashes.
- attempt to restart fingerprintd on the next request
- inform clients that the hardware isn't available and cancel
listeners.
Fixes bug
22492148
Change-Id: Ib27eaf7f197c6a4e6ed9b085602882904d6b794d
Svet Ganov [Wed, 22 Jul 2015 02:23:17 +0000 (19:23 -0700)]
Add a privileged permission to get user accounts
bug:
22602794
Change-Id: I6e5429f0eb5f2cb274d4740755070e588735e179
Dianne Hackborn [Wed, 22 Jul 2015 00:39:46 +0000 (17:39 -0700)]
Fix issue #
22612630: Ensure SMS/Call delivery during Doze
Add whitelist timeout for SMS.
Change-Id: I3392093000ad177a93b6ef36fb18f0398a671423
Svetoslav Ganov [Wed, 22 Jul 2015 00:06:10 +0000 (00:06 +0000)]
Merge "Update permission icons to final versions - framework" into mnc-dev
Wale Ogunwale [Tue, 21 Jul 2015 23:54:54 +0000 (16:54 -0700)]
Fixed issue with not finding existing activity for background user
We currently go through the list of existing activities to find
a match for the launching intent so we can re-use the activity
record if one already exist. However, we exit the search early
once we run across an activity record that doesn't belong to the
current foreground user. This will cause us to create duplicate
activity records if the launching intent is for a backround
user and an activity record already exist.
Based on https://android-review.googlesource.com/#/c/159131
Bug:
22564256
Change-Id: I4b6d94059c11fd2e621e65c8ec2c99427c15b246
Dianne Hackborn [Tue, 21 Jul 2015 23:57:51 +0000 (16:57 -0700)]
Work on issue #
22303510: Additional permissions aren't properly...
...disabled after toggling them off
Keep track of whether a permission that has been declared by an app
was able to actually be installed in the system, along with an API
to find this information so that system UI can tell whether that
permission is of interest.
Also clean up some of the permission debug output.
Change-Id: If4541bedb857789b255bb18f03cad155dcda0b95
George Mount [Tue, 21 Jul 2015 22:51:27 +0000 (22:51 +0000)]
Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev
Jorim Jaggi [Tue, 21 Jul 2015 22:46:30 +0000 (22:46 +0000)]
Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
Fred Chung [Tue, 21 Jul 2015 22:16:55 +0000 (22:16 +0000)]
am
3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs
* commit '
3ccbf3bad50c47409de9570c422756f9e3fa518a':
Doc change: add note about not exiting on onPause().
Fred Chung [Tue, 21 Jul 2015 22:06:13 +0000 (22:06 +0000)]
Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs
Jorim Jaggi [Tue, 21 Jul 2015 21:53:09 +0000 (21:53 +0000)]
Merge "Touch, wake and unlock" into mnc-dev
George Mount [Tue, 21 Jul 2015 21:30:24 +0000 (14:30 -0700)]
Null checks to prevent NPEs in Fragments transactions.
Bug
22631964
Change-Id: I20bc80bfb0ba5f1081d1c349b94db7c5475bcc51
Jeff Sharkey [Tue, 21 Jul 2015 21:23:56 +0000 (21:23 +0000)]
Merge "Avoid NPE when no staged installs." into mnc-dev
John Reck [Tue, 21 Jul 2015 20:50:27 +0000 (20:50 +0000)]
Merge "Mark isInUse per-window" into mnc-dev
Fyodor Kupolov [Tue, 21 Jul 2015 20:32:25 +0000 (20:32 +0000)]
Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
Amith Yamasani [Tue, 21 Jul 2015 20:04:19 +0000 (20:04 +0000)]
Merge "Don't kill apps that are multi-user aware..." into mnc-dev
Alex Klyubin [Tue, 21 Jul 2015 19:50:47 +0000 (19:50 +0000)]
Merge "KM module may consume less input than provided by finish time." into mnc-dev
Jorim Jaggi [Mon, 20 Jul 2015 22:51:40 +0000 (15:51 -0700)]
Add callback to voice interaction session for lockscreen shown
Bug:
22402726
Change-Id: Iaf83e2f2b0389d74b6ecf480aa91a34443803f7b
Adam Lesinski [Tue, 21 Jul 2015 19:26:43 +0000 (19:26 +0000)]
Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
Christopher Tate [Tue, 21 Jul 2015 19:11:34 +0000 (19:11 +0000)]
Merge "Add 'pm' operation to set a package's app-linking state" into mnc-dev
Adam Lesinski [Tue, 21 Jul 2015 19:08:56 +0000 (12:08 -0700)]
BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
Previously we tried to read /d/wakeup_sources to gather kernel wakelock data. If that
fails we used the older sys file /proc/wakelocks.
N7 has both /proc/wakelocks and /d/wakeup_sources, but /proc/wakelocks
has the actual data we need. All other devices are using /d/wakeup_sources, so
only N7 experienced a loss of kernel wakelock data.
The original regression was introduced here: ag/659258
Bug:
22556242
Change-Id: I51ec68e957f587bc1466e24f0a1dbc8cd7753ac6
Fyodor Kupolov [Tue, 21 Jul 2015 18:48:18 +0000 (11:48 -0700)]
Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
Bug:
21521860
Change-Id: I0c2659f84589a77432317fbc89d49716027577d3
Svetoslav [Tue, 21 Jul 2015 19:01:05 +0000 (19:01 +0000)]
Merge "Always create nodes for views backed by an adapter." into mnc-dev
Svet Ganov [Tue, 21 Jul 2015 18:52:21 +0000 (11:52 -0700)]
Update permission icons to final versions - framework
bug:
22383613
Change-Id: I3f524fd0538a1b843b0394fa766f032835d1ecaa
Amith Yamasani [Tue, 21 Jul 2015 18:46:14 +0000 (11:46 -0700)]
Don't kill apps that are multi-user aware...
... when looking for background user apps that hold RECORD_AUDIO
permission.
On switching users, we kill any apps that might potentially be
recording audio. But we don't want to kill critical apps that need
to stay running because of multi-user aware services.
Bug:
22564430
Change-Id: I6d9a684d4e044cc3018f0f8181a44aa143a3baeb
Todd Kennedy [Tue, 21 Jul 2015 18:11:16 +0000 (18:11 +0000)]
Merge "Use RingtonePlayer to get ringtone title" into mnc-dev
John Reck [Tue, 21 Jul 2015 17:23:59 +0000 (10:23 -0700)]
Mark isInUse per-window
Bug:
22509159
Change-Id: I0ae0f1fa582ee38dcb9f24ca20f0b4d0c57ccb32
Kenny Guy [Mon, 20 Jul 2015 15:56:28 +0000 (16:56 +0100)]
Support waiting for adb shell am stop-user to complete.
Use stop user callback to wait for AM.stopUser to complete
if -w flag is passed to adb shell am stop-user
bug:
22599411
Change-Id: I8adbfdbb1ba69a88a67431da65f0a85035587c2d
Nick Kralevich [Tue, 21 Jul 2015 17:16:07 +0000 (17:16 +0000)]
Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev
Raph Levien [Tue, 21 Jul 2015 16:55:37 +0000 (16:55 +0000)]
Merge "Respect style boundaries when measuring text" into mnc-dev
Diego Perez [Tue, 21 Jul 2015 15:41:08 +0000 (15:41 +0000)]
Merge "resolved conflicts for merge of
112d8a36 to mnc-dev" into mnc-dev
Diego Perez [Tue, 21 Jul 2015 14:28:10 +0000 (15:28 +0100)]
resolved conflicts for merge of
112d8a36 to mnc-dev
Change-Id: Ic9511a57db8a96f54dba0704800789a8602b9dd2
Wale Ogunwale [Tue, 21 Jul 2015 14:28:13 +0000 (14:28 +0000)]
Merge "Don't duplicate recent tasks of the same affinity." into mnc-dev
Wale Ogunwale [Mon, 20 Jul 2015 22:43:37 +0000 (15:43 -0700)]
Don't duplicate recent tasks of the same affinity.
In change
510e554283d3dc250f836cd3e4abc36d87319333 we stated
limiting the number of document activity entries in recents
by comparing the realActivity of the tasks. This compared was
done for all tasks not just document tasks there by breaking
the use of task affinity to remove tasks with the same affinity
from recent task list. This change limits the compare of
realActivity to just document tasks.
Bug:
22564474
Bug:
18642190
Change-Id: Idc21ec311f194ab2005cb22380ca56303ae0ad94
Jason Monk [Tue, 21 Jul 2015 14:18:01 +0000 (10:18 -0400)]
Fix blank tiles on QS rotate
Some tiles were skipping updates due to lack of information, make
these tiles handle a clear state better.
Bug:
22531578
Change-Id: I7bd75b3e032592a496fcaf080ce9cbe3b5cf20da
Diego Perez [Tue, 21 Jul 2015 13:20:23 +0000 (13:20 +0000)]
am
d6f2a9ef: am
7720eb18: Merge "Render to measured size when using expand mode" into lmp-mr1-dev
* commit '
d6f2a9efbb0e0525f6cf970fd9c9b9b7082b19f9':
Render to measured size when using expand mode
Diego Perez [Tue, 21 Jul 2015 13:06:52 +0000 (13:06 +0000)]
am
7720eb18: Merge "Render to measured size when using expand mode" into lmp-mr1-dev
* commit '
7720eb18c1c2fe06e8f4b2f6e2936a4072494da8':
Render to measured size when using expand mode
Diego Perez [Tue, 21 Jul 2015 12:56:50 +0000 (12:56 +0000)]
Merge "Render to measured size when using expand mode" into lmp-mr1-dev
Christopher Tate [Mon, 20 Jul 2015 22:39:39 +0000 (15:39 -0700)]
Add 'pm' operation to set a package's app-linking state
Set an app's state:
pm set-app-link [--user USER_ID] PACKAGE {always|ask|never|undefined}
Read an app's current state:
pm get-app-link [--user USER_ID] PACKAGE
The latter prints to stdout one of the strings usable as an argument to
set-app-link. If an error is encountered, the string printed to
stderr begins with "Error: ".
Bug
19628527
Change-Id: I68b6dc24445917807345a8cf5baa2078490740af
Todd Kennedy [Mon, 20 Jul 2015 20:32:40 +0000 (13:32 -0700)]
Use RingtonePlayer to get ringtone title
Instead of requiring every application that calls Rintone.getTitle()
to request android.permission.READ_EXTERNAL_STORAGE, pass the call
through to the system UI process. We only do this for media store
URIs.
Bug:
22067670
Change-Id: I38cf3fb8d769ef6984c41a7b04afbbd4c57175ce