OSDN Git Service

android-x86/frameworks-base.git
8 years agoSuppress output for Protobuf data if Bluetooth is disabled
Pavlin Radoslavov [Tue, 23 Feb 2016 19:54:37 +0000 (11:54 -0800)]
Suppress output for Protobuf data if Bluetooth is disabled

If Bluetooth is disabled or there is some other error,
don't print anything when extracting the Metrics-related data
in Protobuf format.

[Cherry-pick from AOSP]

Bug: 27315491
Change-Id: Ic1ec5334fbf0b524909400f080e2eac3ec34edf4

8 years agoMerge "Fix WebView Metrics opt out Javadoc formatting" into nyc-dev
Paul Miller [Wed, 24 Feb 2016 18:25:17 +0000 (18:25 +0000)]
Merge "Fix WebView Metrics opt out Javadoc formatting" into nyc-dev

8 years agoMerge "Move clock down 4dp in QS header" into nyc-dev
Jason Monk [Wed, 24 Feb 2016 18:23:44 +0000 (18:23 +0000)]
Merge "Move clock down 4dp in QS header" into nyc-dev

8 years agoMove clock down 4dp in QS header
Jason Monk [Wed, 24 Feb 2016 18:16:57 +0000 (13:16 -0500)]
Move clock down 4dp in QS header

Bug: 27319941
Change-Id: Ib4d8ea7814738f2e6b8ab3095a7e456d7c1f7366

8 years agoAlways consume bottom insets when navigation bar is force shown
Jorim Jaggi [Fri, 12 Feb 2016 23:04:21 +0000 (15:04 -0800)]
Always consume bottom insets when navigation bar is force shown

When an app requests SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION but we
force show the navigation bar, we need to treat for the app like
there is no virtual navigation bar on the device. Because if you
combine it with FLAG_HIDE_NAVIGATION, you'd expect the navigation
bar gets hidden but it doesn't, so there could be content that
overlaps with the navigation bar.

Bug: 27157904
Change-Id: I088e02eae2e723c35e9cb4873de6b1325458533b

8 years agoMerge "DPM: installKeyPair variant: caller can self-grant" into nyc-dev
Robin Lee [Wed, 24 Feb 2016 18:14:34 +0000 (18:14 +0000)]
Merge "DPM: installKeyPair variant: caller can self-grant" into nyc-dev

8 years agoMerge "Fix bootloops in TwilightService" into nyc-dev
Jason Monk [Wed, 24 Feb 2016 18:00:44 +0000 (18:00 +0000)]
Merge "Fix bootloops in TwilightService" into nyc-dev

8 years agoMerge "Fix issue #27289462: Alarm clock not working on NRC49C" into nyc-dev
Dianne Hackborn [Wed, 24 Feb 2016 18:00:38 +0000 (18:00 +0000)]
Merge "Fix issue #27289462: Alarm clock not working on NRC49C" into nyc-dev

8 years agoMerge "Work towards issue #26390161: Throttle syncs/jobs when system is low on RAM...
Dianne Hackborn [Wed, 24 Feb 2016 18:00:27 +0000 (18:00 +0000)]
Merge "Work towards issue #26390161: Throttle syncs/jobs when system is low on RAM" into nyc-dev

8 years agoFix bootloops in TwilightService
Jason Monk [Wed, 24 Feb 2016 17:56:16 +0000 (12:56 -0500)]
Fix bootloops in TwilightService

Bug: 27336023
Change-Id: I983f05bd69fd27bb3e3ae121d19fc9d006c95ffb

8 years agoMerge "Enable to set canRecord and tunerCount statically" into nyc-dev
Jae Seo [Wed, 24 Feb 2016 17:53:46 +0000 (17:53 +0000)]
Merge "Enable to set canRecord and tunerCount statically" into nyc-dev

8 years agoMerge "DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager...
Shishir Agrawal [Wed, 24 Feb 2016 17:42:33 +0000 (17:42 +0000)]
Merge "DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager." into mm-wireless-dev
am: d94fbf85d6  -s ours

* commit 'd94fbf85d6b9affc29fb312abd3548f3727c80c4':
  DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager.

8 years agoMerge "Add subscription specific TelephonyManager calls." into nyc-dev
Shishir Agrawal [Wed, 24 Feb 2016 17:35:44 +0000 (17:35 +0000)]
Merge "Add subscription specific TelephonyManager calls." into nyc-dev

8 years agoMerge "DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager...
Shishir Agrawal [Wed, 24 Feb 2016 17:33:11 +0000 (17:33 +0000)]
Merge "DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager." into mm-wireless-dev

8 years agoMerge "Add SystemApi for retrieving device flash lock state" into nyc-dev
Andres Morales [Wed, 24 Feb 2016 17:30:25 +0000 (17:30 +0000)]
Merge "Add SystemApi for retrieving device flash lock state" into nyc-dev

8 years agoDPM: installKeyPair variant: caller can self-grant
Robin Lee [Wed, 24 Feb 2016 12:08:32 +0000 (12:08 +0000)]
DPM: installKeyPair variant: caller can self-grant

If 'requestAccess' is true, the caller (either profile/device owner or a
designated certificate installer) will be granted usage of the keypair
on successful installation.

This has no security implications for a profile/device owner which would
already be able to self-grant. Delegated certificate installers did not
have this ability before.

This is only allowed at install-time- not afterward.

Bug: 24746231
Change-Id: Ia0ec290bb0bcde1d8137c188e2667cb7718dbfd7

8 years agoMerge "Audio record notification: report client/device configuration" into nyc-dev
Jean-Michel Trivi [Wed, 24 Feb 2016 17:08:32 +0000 (17:08 +0000)]
Merge "Audio record notification: report client/device configuration" into nyc-dev

8 years agoMerge "Don't try caching null ringtones." into nyc-dev
Jeff Sharkey [Wed, 24 Feb 2016 16:55:36 +0000 (16:55 +0000)]
Merge "Don't try caching null ringtones." into nyc-dev

8 years agoDon't try caching null ringtones.
Jeff Sharkey [Wed, 24 Feb 2016 16:54:14 +0000 (09:54 -0700)]
Don't try caching null ringtones.

Bug: 27330629
Change-Id: Id09d10d6f4a3a20782480647c68a5c94ef69e7b3

8 years agoMerge "Fix error formatting for copy/move/delete failures." into nyc-dev
Steve McKay [Wed, 24 Feb 2016 16:24:28 +0000 (16:24 +0000)]
Merge "Fix error formatting for copy/move/delete failures." into nyc-dev

8 years agoMerge "Add constant to link to app's general settings" into nyc-dev
Jason Monk [Wed, 24 Feb 2016 16:23:01 +0000 (16:23 +0000)]
Merge "Add constant to link to app's general settings" into nyc-dev

8 years agoOnly prolong animations for freeform
Jorim Jaggi [Wed, 24 Feb 2016 02:21:40 +0000 (21:21 -0500)]
Only prolong animations for freeform

So we don't unnecessarily slow down the regular transition

Change-Id: I84e4bf0f9a7caf59dd20478166458f2642e98c80

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Wed, 24 Feb 2016 15:37:35 +0000 (15:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 24 Feb 2016 15:32:23 +0000 (07:32 -0800)]
Import translations. DO NOT MERGE

Change-Id: I5cf7b687227eab1006fd0fe7b8bd09bb8e1740e2
Auto-generated-cl: translation import

8 years agoAdd constant to link to app's general settings
Jason Monk [Tue, 23 Feb 2016 22:57:28 +0000 (17:57 -0500)]
Add constant to link to app's general settings

Bug: 27276982
Change-Id: Ia438faeb12b24251bb74919f680713a7bc03e0b5

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Wed, 24 Feb 2016 15:23:12 +0000 (15:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 24 Feb 2016 15:22:14 +0000 (07:22 -0800)]
Import translations. DO NOT MERGE

Change-Id: I33919dcf9c769c9aeb603e6c9d022fc1aeba10ca
Auto-generated-cl: translation import

8 years agoMerge "Support changes in Settings for battery graph" into nyc-dev
Jason Monk [Wed, 24 Feb 2016 14:21:18 +0000 (14:21 +0000)]
Merge "Support changes in Settings for battery graph" into nyc-dev

8 years agoMerge "Fix QS battery details not updating" into nyc-dev
Jason Monk [Wed, 24 Feb 2016 14:17:06 +0000 (14:17 +0000)]
Merge "Fix QS battery details not updating" into nyc-dev

8 years agoMerge "Throw UnsupportedOperationException when creating ephemeral user on a system...
Lenka Trochtova [Wed, 24 Feb 2016 13:50:16 +0000 (13:50 +0000)]
Merge "Throw UnsupportedOperationException when creating ephemeral user on a system without split system user." into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 24 Feb 2016 13:25:31 +0000 (08:25 -0500)]
Import translations. DO NOT MERGE

Change-Id: I71f7d4c86befd1e8aecfe397792b63c1cf74aa29
Auto-generated-cl: translation import

8 years agoMerge "Call webview updating logic with the system UID when setup done." into nyc-dev
Gustav Sennton [Wed, 24 Feb 2016 12:56:08 +0000 (12:56 +0000)]
Merge "Call webview updating logic with the system UID when setup done." into nyc-dev

8 years agoMerge "Prevent ephemeral user from being re-entered after stop." into nyc-dev
Lenka Trochtova [Wed, 24 Feb 2016 12:34:57 +0000 (12:34 +0000)]
Merge "Prevent ephemeral user from being re-entered after stop." into nyc-dev

8 years agoMerge "Removing lock contention in SecurityLogMonitor" into nyc-dev
Michal Karpinski [Wed, 24 Feb 2016 12:12:25 +0000 (12:12 +0000)]
Merge "Removing lock contention in SecurityLogMonitor" into nyc-dev

8 years agoRemoving lock contention in SecurityLogMonitor
Michal Karpinski [Fri, 19 Feb 2016 12:47:46 +0000 (12:47 +0000)]
Removing lock contention in SecurityLogMonitor

After being interrupted the monitor thread tried to acquire
a lock that is held by interrupting thread, resulting in timeouting
on join().

Bug: 27061904
Change-Id: Ifbd578d5f5a266083b207fedd8ebb6d26ab08c31

8 years agoMerge "Fix FontFamily nAddFontWeightStyle in nyc" into nyc-dev
Diego Perez [Wed, 24 Feb 2016 11:50:22 +0000 (11:50 +0000)]
Merge "Fix FontFamily nAddFontWeightStyle in nyc" into nyc-dev

8 years agoMerge "Should call clearCallingIdentity before accessing getProfileParent" into nyc-dev
Tony Mak [Wed, 24 Feb 2016 11:36:39 +0000 (11:36 +0000)]
Merge "Should call clearCallingIdentity before accessing getProfileParent" into nyc-dev

8 years agoShould call clearCallingIdentity before accessing getProfileParent
Tony Mak [Wed, 24 Feb 2016 11:08:38 +0000 (11:08 +0000)]
Should call clearCallingIdentity before accessing getProfileParent

Bug: 27308833
Change-Id: Ib33fcc0f30dada5f307f45c7c85dce5fb5e4a064

8 years agoCall webview updating logic with the system UID when setup done.
Gustav Sennton [Wed, 24 Feb 2016 10:58:09 +0000 (10:58 +0000)]
Call webview updating logic with the system UID when setup done.

After performing the webview setup we check whether we changed webview
implementation during the setup and, if so, we rerun the updating-logic.
This logic needs special permissions such as changing settings
(Settings.Global) which the shared relro process doesn't have,
therefore, when the shared relro process notifies us that the setup is
done we need to switch to using the system uid when running the
update-logic.

Bug: 27262336
Change-Id: I68646884e31ba55c860ff98c3f30a520beb0ef95

8 years agoPrevent ephemeral user from being re-entered after stop.
Lenka Trochtova [Fri, 12 Feb 2016 09:42:12 +0000 (10:42 +0100)]
Prevent ephemeral user from being re-entered after stop.

Once the ephemeral user stops, the user's deletion is scheduled.
It takes a while before the user actually disappears and it is not
desirable for the user to be re-entered in the meantime.
Mark the user as disabled on stop and check this flag
in the activity manager to prevent the user from being switched
to again. Also hide the user from user-switching UI.

BUG: 26795729
BUG: 26780152

Change-Id: I83a61674958954b5a210114b88ffa5ae55922c1f

8 years agoMerge "Clarify javadoc for SecurityLog" into nyc-dev
Rubin Xu [Wed, 24 Feb 2016 10:31:35 +0000 (10:31 +0000)]
Merge "Clarify javadoc for SecurityLog" into nyc-dev

8 years agoFix error formatting for copy/move/delete failures.
Tomasz Mikolajewski [Wed, 24 Feb 2016 10:23:54 +0000 (19:23 +0900)]
Fix error formatting for copy/move/delete failures.

This caused major failures in the job operations, including
failing tests.

Change-Id: I697f1481df39a156f7ebfde08b31af6b23380f17

8 years agoMerge "Wire removeDocument() to Jobs." into nyc-dev
Tomasz Mikolajewski [Wed, 24 Feb 2016 08:42:15 +0000 (08:42 +0000)]
Merge "Wire removeDocument() to Jobs." into nyc-dev

8 years agoresolve merge conflicts of 51e4acb29d to nyc-dev
Lorenzo Colitti [Wed, 24 Feb 2016 06:06:39 +0000 (15:06 +0900)]
resolve merge conflicts of 51e4acb29d to nyc-dev

Also add the appropriate changes to api/test-current.txt, which
is not present on mm-wireless-dev from which this change came.

Change-Id: Ic4df6d0f89add73b7e5252ef662de07a4e8fce31

8 years agoMerge "Add Connectivity Metrics Logger service" into mm-wireless-dev
Pierre Imai [Wed, 24 Feb 2016 04:49:24 +0000 (04:49 +0000)]
Merge "Add Connectivity Metrics Logger service" into mm-wireless-dev

8 years agoMerge "Adapted the lockscreen style" into nyc-dev
Selim Cinek [Wed, 24 Feb 2016 03:59:44 +0000 (03:59 +0000)]
Merge "Adapted the lockscreen style" into nyc-dev

8 years agoWire removeDocument() to Jobs.
Tomasz Mikolajewski [Tue, 23 Feb 2016 06:12:54 +0000 (15:12 +0900)]
Wire removeDocument() to Jobs.

Bug: 27303034
Change-Id: I6388e2b70b523670210cd8285800b4c187c8f8b8

8 years agoMerge "Update accessibility to be encryption-aware." into nyc-dev
Jeff Sharkey [Wed, 24 Feb 2016 03:17:10 +0000 (03:17 +0000)]
Merge "Update accessibility to be encryption-aware." into nyc-dev

8 years agoUpdate accessibility to be encryption-aware.
Jeff Sharkey [Wed, 24 Feb 2016 00:52:16 +0000 (17:52 -0700)]
Update accessibility to be encryption-aware.

Look for both EA and non-EA accessibility services, but when the user
is locked only bind to EA services.  Once the user is unlocked, we
take another pass and bind to any non-EA services.

We only consider disabling accessibility once the user is unlocked,
since there could be non-EA services waiting in the wings.

Bug: 25860579
Change-Id: I97bd019661457c3577d629ba12290d02f026011a

8 years agoMerge "TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER" into...
Dongwon Kang [Wed, 24 Feb 2016 02:09:01 +0000 (02:09 +0000)]
Merge "TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER" into nyc-dev

8 years agoTIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER
Dongwon Kang [Wed, 17 Feb 2016 18:40:44 +0000 (10:40 -0800)]
TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER

Bug: 21778419
Change-Id: I1684e2f1c274306706736061e3f41c9840e563c4

8 years agoAdapted the lockscreen style
Selim Cinek [Tue, 23 Feb 2016 20:28:31 +0000 (12:28 -0800)]
Adapted the lockscreen style

It's that time of the release again.

Bug: 24866646
Change-Id: Iebfae2f2cc6b5a21b7b98df359de2247b2bc8632

8 years agoFix issue #27289462: Alarm clock not working on NRC49C
Dianne Hackborn [Wed, 24 Feb 2016 01:54:30 +0000 (17:54 -0800)]
Fix issue #27289462: Alarm clock not working on NRC49C

Don't really want the system to crash.

Change-Id: I4b8ebca00a4e6a7d67717baf7267165de9e8afb3

8 years agoMerge "ImageReader: override the flexible YUV compatible formats" into nyc-dev
Zhijun He [Wed, 24 Feb 2016 01:45:29 +0000 (01:45 +0000)]
Merge "ImageReader: override the flexible YUV compatible formats" into nyc-dev

8 years agoMerge "Make FingerprintManager#hasEnrolledFingerprints per-user" into nyc-dev
Clara Bayarri [Wed, 24 Feb 2016 01:30:58 +0000 (01:30 +0000)]
Merge "Make FingerprintManager#hasEnrolledFingerprints per-user" into nyc-dev

8 years agoAdd subscription specific TelephonyManager calls.
Shishir Agrawal [Wed, 17 Feb 2016 19:36:15 +0000 (11:36 -0800)]
Add subscription specific TelephonyManager calls.

SubId specific version of the following functions are being added.
  - hasCarrierPrivileges
  - iccCloseLogicalChannel
  - iccExchangeSimIO
  - iccOpenLogicalChannel
  - iccTransmitApduBasicChannel
  - iccTransmitApduLogicalChannel
  - sendEnvelopeWithStatus
  - setOperatorBrandOverride
  - setPreferredNetworkTypeToGlobal

Bug: 26772894

Change-Id: I8c9e6d9bfe73f530e6f91c86211103fdfb1520bf

8 years agoWork towards issue #26390161: Throttle syncs/jobs when system is low on RAM
Dianne Hackborn [Wed, 24 Feb 2016 01:04:58 +0000 (17:04 -0800)]
Work towards issue #26390161: Throttle syncs/jobs when system is low on RAM

First, we need to make the job scheduler prioritize jobs for
foreground apps over background apps (so we will degrade well
when we are limiting the number of concurrent jobs).

So now the job scheduler keeps track of the process state of
each uid, and uses that to bump up the priority of jobs
associated with foreground uids.  Added constants for priorities
since we have different places specifying priorities.

Also cleaned up a bit of the reporting of "wrapped" jobs from
the sync manager -- there is a new tag argument that can be supplied,
to have the name and tag used in various places be based on that
instead of the useless internal class name.

Change-Id: I8781750ddfac1472a98e1873fc38c014425db3d6

8 years agoEnable to set canRecord and tunerCount statically
Jae Seo [Sat, 20 Feb 2016 02:39:28 +0000 (18:39 -0800)]
Enable to set canRecord and tunerCount statically

Bug: 27276122
Change-Id: I61d07cfdbe13e4484ccaf5cdcf0796f08c78e2a8

8 years agoMerge "Disable switching users until user 0 is unlocked" into nyc-dev
Fyodor Kupolov [Wed, 24 Feb 2016 00:51:09 +0000 (00:51 +0000)]
Merge "Disable switching users until user 0 is unlocked" into nyc-dev

8 years agoMake FingerprintManager#hasEnrolledFingerprints per-user
Clara Bayarri [Fri, 19 Feb 2016 16:54:49 +0000 (16:54 +0000)]
Make FingerprintManager#hasEnrolledFingerprints per-user

Needed by Settings to determine if the work profile has fingerprints

Bug: 27263452
Change-Id: Ic54f59461b44a525284f6a1ab3d17627c652f842

8 years agoAudio record notification: report client/device configuration
Jean-Michel Trivi [Mon, 22 Feb 2016 18:52:41 +0000 (10:52 -0800)]
Audio record notification: report client/device configuration

Report client and device recording configuration during updates.
Support querying the AudioFormat in AudioRecordConfiguration.

Bug 22876530

Change-Id: I90b44db9bc3fda479452fc63221f8082f5b6a741

8 years agoFix wrong measurement in DecorView
Jorim Jaggi [Wed, 24 Feb 2016 00:20:59 +0000 (19:20 -0500)]
Fix wrong measurement in DecorView

Bug: 27215338
Change-Id: I512df9b23788daf485b020a2199a55a7c6ab6311

8 years agoMerge "TIF: Unhide URI util methods" into nyc-dev
Jae Seo [Tue, 23 Feb 2016 23:39:08 +0000 (23:39 +0000)]
Merge "TIF: Unhide URI util methods" into nyc-dev

8 years agoMerge "Add new ConnectionEvent API (hide) to send a notification to Telecom" into...
Tyler Gunn [Tue, 23 Feb 2016 23:38:58 +0000 (23:38 +0000)]
Merge "Add new ConnectionEvent API (hide) to send a notification to Telecom" into nyc-dev

8 years agoMerge "Fix drawColor/drawPaint bounds" into nyc-dev
Chris Craik [Tue, 23 Feb 2016 23:33:51 +0000 (23:33 +0000)]
Merge "Fix drawColor/drawPaint bounds" into nyc-dev

8 years agoTIF: Unhide URI util methods
Jae Seo [Tue, 23 Feb 2016 22:57:02 +0000 (14:57 -0800)]
TIF: Unhide URI util methods

Bug: 27314735
Change-Id: Ib2aeb451a435bb959efb1cba359c335b051f88e5

8 years agoDO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager.
Shishir Agrawal [Wed, 17 Feb 2016 23:52:09 +0000 (15:52 -0800)]
DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager.

All MSIM specific calls should not use a suffix/prefix.

Bug: 26772894
Change-Id: I49488dfc41bb7996a1a44447968ec11132e4dac7

8 years agoMerge "Copy shared accounts after the user is unlocked" into nyc-dev
Fyodor Kupolov [Tue, 23 Feb 2016 23:05:38 +0000 (23:05 +0000)]
Merge "Copy shared accounts after the user is unlocked" into nyc-dev

8 years agoMerge "DO NOT MERGE: Add subscription specific TelephonyManager calls." into mm-wirel...
Shishir Agrawal [Tue, 23 Feb 2016 23:04:25 +0000 (23:04 +0000)]
Merge "DO NOT MERGE: Add subscription specific TelephonyManager calls." into mm-wireless-dev
am: 29c490bcd3  -s ours

* commit '29c490bcd31cda210e1730649ba4fef02d74c69d':
  DO NOT MERGE: Add subscription specific TelephonyManager calls.

8 years agoMerge "DO NOT MERGE: Add subscription specific TelephonyManager calls." into mm-wirel...
Shishir Agrawal [Tue, 23 Feb 2016 22:59:23 +0000 (22:59 +0000)]
Merge "DO NOT MERGE: Add subscription specific TelephonyManager calls." into mm-wireless-dev

8 years agoMerge "Support running AVD on UI thread" into nyc-dev
Doris Liu [Tue, 23 Feb 2016 22:43:52 +0000 (22:43 +0000)]
Merge "Support running AVD on UI thread" into nyc-dev

8 years agoSupport running AVD on UI thread
Doris Liu [Tue, 23 Feb 2016 00:51:40 +0000 (16:51 -0800)]
Support running AVD on UI thread

By default, AVD animates on RT thread. But since in some cases there's a
need for a finer control on when the frame update for the animation should
happen, such as coordiating the AVD animation with other animations that
run on UI thread, we are providing a way to force the AVD to run on UI
thread.

Bug: 27278616
Change-Id: I372ecd3dc52e3fa0bdce3a1e9c19443f9b199027

8 years agoDO NOT MERGE Bluetooth: Restrict gain for Absolute volume case am: 9ef7634fa9 am...
Liejun Tao [Tue, 23 Feb 2016 22:14:24 +0000 (22:14 +0000)]
DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case am: 9ef7634fa9 am: d46bd91531
am: 2fb16b066b  -s ours

* commit '2fb16b066b3e4e22ee489f31f75170ebc052f0ec':
  DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case

8 years agoMerge "Scale phone state icons." into nyc-dev
Anthony Chen [Tue, 23 Feb 2016 22:11:16 +0000 (22:11 +0000)]
Merge "Scale phone state icons." into nyc-dev

8 years agoDO NOT MERGE Bluetooth: Restrict gain for Absolute volume case am: 9ef7634fa9
Liejun Tao [Tue, 23 Feb 2016 22:00:37 +0000 (22:00 +0000)]
DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case am: 9ef7634fa9
am: d46bd91531

* commit 'd46bd9153144f905138e0b609c3d8252a5d5505e':
  DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case

8 years agoDO NOT MERGE Bluetooth: Restrict gain for Absolute volume case
Liejun Tao [Tue, 23 Feb 2016 21:54:00 +0000 (21:54 +0000)]
DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case
am: 9ef7634fa9

* commit '9ef7634fa9b4e9cf9ea9380aee8b7dfd71f24b57':
  DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case

8 years agoMerge "Emulator: Replace ro.kernel.qemu.gles with qemu.gles" into nyc-dev
Bo Hu [Tue, 23 Feb 2016 21:46:31 +0000 (21:46 +0000)]
Merge "Emulator: Replace ro.kernel.qemu.gles with qemu.gles" into nyc-dev

8 years agoMerge changes from topic \'notification\' into mm-wireless-dev
Pankaj Kanwar [Tue, 23 Feb 2016 21:40:52 +0000 (21:40 +0000)]
Merge changes from topic \'notification\' into mm-wireless-dev
am: 2339b786c7

* commit '2339b786c77fb75f2f123f592195579da20554ca':
  Changing string in notification when data is blocked. b/25209821
  Changing string in notification when data is blocked. b/25209821

8 years agoFix WebView Metrics opt out Javadoc formatting
Paul Miller [Tue, 23 Feb 2016 21:39:19 +0000 (13:39 -0800)]
Fix WebView Metrics opt out Javadoc formatting

BUG:27305383
Change-Id: I23afa271058479263abe714f1a3493562f0cfe9e

8 years agoMerge "Removed warning icons and use friendlier locale names" into nyc-dev
Mihai Niță [Tue, 23 Feb 2016 21:37:03 +0000 (21:37 +0000)]
Merge "Removed warning icons and use friendlier locale names" into nyc-dev

8 years agoMerge changes from topic 'notification' into mm-wireless-dev
Pankaj Kanwar [Tue, 23 Feb 2016 21:32:15 +0000 (21:32 +0000)]
Merge changes from topic 'notification' into mm-wireless-dev

* changes:
  Changing string in notification when data is blocked. b/25209821
  Changing string in notification when data is blocked. b/25209821

8 years agoMake getBatteryUptimeLocked protected so it can be mocked.
Joe Onorato [Tue, 23 Feb 2016 21:25:10 +0000 (13:25 -0800)]
Make getBatteryUptimeLocked protected so it can be mocked.

Also fix test names.

Change-Id: I43477e61c22cd36735214951c45c52b39095e1b5

8 years agoRemoved warning icons and use friendlier locale names
Mihai Nita [Tue, 23 Feb 2016 00:40:26 +0000 (16:40 -0800)]
Removed warning icons and use friendlier locale names

* Removed warning icons in locale list (b/26710677)
* Use getDisplayNameWithDialect() instead of getDisplayName()
  for the locale names (b/27066642)
* Set proper locale for the language labels (b/27130516)
* Fixed build warning in LocaleHelper (b/27148053)

Bug: 26710677
Bug: 27066642
Bug: 27130516
Bug: 27148053
Change-Id: I149a3675262b286c8b740d2ad5b02f4df31316ec

8 years agoMerge changes I4e45afed,I2ea19f9a,I922d6f38 into nyc-dev
Joe Onorato [Tue, 23 Feb 2016 21:06:22 +0000 (21:06 +0000)]
Merge changes I4e45afed,I2ea19f9a,I922d6f38 into nyc-dev

* changes:
  Add unit tests for BatteryStatsImpl.
  Turn down the logging a little bit.
  Turn down the logging a little bit.

8 years agoMerge "Offer to cache ringtones in system DE storage." into nyc-dev
Jeff Sharkey [Tue, 23 Feb 2016 20:57:45 +0000 (20:57 +0000)]
Merge "Offer to cache ringtones in system DE storage." into nyc-dev

8 years agoMerge "Clear calling identity on Session.startingMovingTask" into nyc-dev
Wale Ogunwale [Tue, 23 Feb 2016 20:50:49 +0000 (20:50 +0000)]
Merge "Clear calling identity on Session.startingMovingTask" into nyc-dev

8 years agoMerge "TIF: Add @NonNull for Programs.Genres.encode/decode" into nyc-dev
Dongwon Kang [Tue, 23 Feb 2016 20:45:21 +0000 (20:45 +0000)]
Merge "TIF: Add @NonNull for Programs.Genres.encode/decode" into nyc-dev

8 years agoAdd unit tests for BatteryStatsImpl.
Joe Onorato [Tue, 9 Feb 2016 00:49:39 +0000 (16:49 -0800)]
Add unit tests for BatteryStatsImpl.

- Add a Clocks interface to wrap SystemClock.uptimeMillis and
  SystemClock.elapsedRealtime.
- Make the inner classes static so they can be created independently,
  which meant passing explicit pointers to the BatteryStatsImpl and
  the Uid objects in a lot of places.
- Make several fields protected so they can be accessed by the tests (they are
  still @hidden)
- Add a test suite for the battery stats.
- Add the tests

Change-Id: I4e45afedc64f7050985c28a7eb4f5c1ddbaa63fa

8 years agoTurn down the logging a little bit.
Joe Onorato [Tue, 2 Feb 2016 02:04:24 +0000 (18:04 -0800)]
Turn down the logging a little bit.

Change-Id: I2ea19f9a7951c215aee98825f9cb2923295a965d

8 years agoTurn down the logging a little bit.
Joe Onorato [Tue, 2 Feb 2016 01:45:03 +0000 (17:45 -0800)]
Turn down the logging a little bit.

Change-Id: I922d6f3895d80292fbf613b90e502cad462bb9ef

8 years agoTIF: Add @NonNull for Programs.Genres.encode/decode
Dongwon Kang [Tue, 23 Feb 2016 18:30:51 +0000 (10:30 -0800)]
TIF: Add @NonNull for Programs.Genres.encode/decode

Bug: 27292029
Change-Id: Ib74f6383f3b0880179b51268e730ea8e88ab20c3

8 years agoMerge "Revert "Revert "Add option to allow key validity after fingerprint enrollment...
Shawn Willden [Tue, 23 Feb 2016 20:33:09 +0000 (20:33 +0000)]
Merge "Revert "Revert "Add option to allow key validity after fingerprint enrollment.""" into nyc-dev

8 years agoMerge "Remove @Nullable annotation from getDrawable() methods" into nyc-dev
Alan Viverette [Tue, 23 Feb 2016 20:30:06 +0000 (20:30 +0000)]
Merge "Remove @Nullable annotation from getDrawable() methods" into nyc-dev

8 years agoOffer to cache ringtones in system DE storage.
Jeff Sharkey [Tue, 23 Feb 2016 00:52:45 +0000 (17:52 -0700)]
Offer to cache ringtones in system DE storage.

Ringtones often live on shared media, which is now encrypted with CE
keys and not available until after the user is unlocked.  To improve
the user experience while locked, cache the default ringtone,
notification sound, and alarm sound in a DE storage area.

Bug: 26730753
Change-Id: Ie6ad7790af4c87dd25759df3ed017e3b91a2fb87

8 years agoClear calling identity on Session.startingMovingTask
Wale Ogunwale [Tue, 23 Feb 2016 18:38:35 +0000 (10:38 -0800)]
Clear calling identity on Session.startingMovingTask

This call is comming from the client which doesn't have
the manage task permission required by setFocusTask in AM.

Bug: 27157914
Change-Id: I494a0c44e8fb4316a16bcd44c87bdd8d23e7e6d5

8 years agoRemove @Nullable annotation from getDrawable() methods
Alan Viverette [Tue, 23 Feb 2016 19:59:51 +0000 (14:59 -0500)]
Remove @Nullable annotation from getDrawable() methods

Developers usually do not need to check the result of getDrawable(), so
we shouldn't be annotating it like they do.

Bug: 27134828
Change-Id: I0db0ca806fd89c18781da452fe3f31ef344f3cca

8 years agoDisable switching users until user 0 is unlocked
Fyodor Kupolov [Wed, 17 Feb 2016 18:46:11 +0000 (10:46 -0800)]
Disable switching users until user 0 is unlocked

Switching with user0 locked can be re-enabled by setting
allow_user_switching_when_system_user_locked flag to a non-zero value

Bug: 26933989
Change-Id: I0958058f1cc8a059db9c20930e07183c14c8460a

8 years agoMerge "Fix NinePatchDrawable handling of density changes" into nyc-dev
Alan Viverette [Tue, 23 Feb 2016 19:56:22 +0000 (19:56 +0000)]
Merge "Fix NinePatchDrawable handling of density changes" into nyc-dev

8 years agoFix NinePatchDrawable handling of density changes
Alan Viverette [Tue, 23 Feb 2016 19:54:01 +0000 (14:54 -0500)]
Fix NinePatchDrawable handling of density changes

Scaling is now manually applied when the canvas density is not set.

Removes set/getNinePatch accessors that were added in N, since these
are not used and setting the nine patch directly will break padding.
Also removes local NinePatch, which was not necessary.

Bug: 27038114
Change-Id: Ie8b2e485b54d1ed1521081b329a09915fd0a95c1

8 years agoMerge "Camera2: Fix getInternalFormatSizes for depth" into nyc-dev
Chien-Yu Chen [Tue, 23 Feb 2016 19:52:19 +0000 (19:52 +0000)]
Merge "Camera2: Fix getInternalFormatSizes for depth" into nyc-dev