OSDN Git Service
Nathan Harold [Wed, 24 Feb 2016 20:02:09 +0000 (20:02 +0000)]
Merge "Adding Error Codes for IWLAN/EPDG Connection" into mm-wireless-dev
am:
17469433e3
* commit '
17469433e35e5a137ff37cb3a5fdead76574c146':
Adding Error Codes for IWLAN/EPDG Connection
Nathan Harold [Wed, 24 Feb 2016 19:55:52 +0000 (19:55 +0000)]
Merge "Adding Error Codes for IWLAN/EPDG Connection" into mm-wireless-dev
Amith Yamasani [Wed, 24 Feb 2016 19:42:10 +0000 (19:42 +0000)]
Merge "Optimize calls to TelephonyManager to check for privileged apps" into nyc-dev
Sergey Poromov [Wed, 24 Feb 2016 19:40:51 +0000 (19:40 +0000)]
Merge "Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()" into nyc-dev
Amith Yamasani [Fri, 19 Feb 2016 20:55:27 +0000 (12:55 -0800)]
Optimize calls to TelephonyManager to check for privileged apps
Calling into TelephonyManager each of hundreds of apps to check
if the app is carrier privileged was very expensive, especially
when there aren't even any carrier access rules specified. This
change fetches all the carrier privileged apps in one call,
reducing the number of IPC calls to the radio process and checks
the package names locally.
If the carrier rules change or packages are modified, the list
will be computed and fetched again.
Other optimizations in Telephony help speed up the individual calls
to check if a package is privileged, as well.
Bug:
27271861
Change-Id: I5a77b6da4f2cdc603d2a73bd8569c5c38f06b42d
Jason Monk [Wed, 24 Feb 2016 19:22:49 +0000 (19:22 +0000)]
Merge "Hide some tuner stuff that isn't ready." into nyc-dev
Adam Powell [Wed, 24 Feb 2016 19:13:53 +0000 (19:13 +0000)]
Merge "Un-hide string set persistence methods in Preference" into nyc-dev
Gustav Sennton [Wed, 24 Feb 2016 19:00:35 +0000 (19:00 +0000)]
Merge "Add fallback packages to be enabled iff no webview packages are valid" into nyc-dev
Jorim Jaggi [Wed, 24 Feb 2016 18:44:24 +0000 (13:44 -0500)]
Fix build
Change-Id: Id21200a8239908c18379d67639c090ccfd3772f2
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
Sergey Poromov [Wed, 24 Feb 2016 16:21:59 +0000 (17:21 +0100)]
Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()
BackupManagerService has the null check, but it doesn't work
because passed BackupObserver object is wrapped into
this BackupObserverWrapper.
This was found during GTS testing.
Bug:
27334738
Change-Id: I16dc0230824b326d3fae1f8489f58b0c0d4e1c7c
Paul Miller [Wed, 24 Feb 2016 18:25:17 +0000 (18:25 +0000)]
Merge "Fix WebView Metrics opt out Javadoc formatting" 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
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
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
Robin Lee [Wed, 24 Feb 2016 18:14:34 +0000 (18:14 +0000)]
Merge "DPM: installKeyPair variant: caller can self-grant" into nyc-dev
Jason Monk [Wed, 24 Feb 2016 18:01:53 +0000 (13:01 -0500)]
Hide some tuner stuff that isn't ready.
Change-Id: I075098068f4c9f91705e1196b40ab2d36d658bab
Jason Monk [Wed, 24 Feb 2016 18:00:44 +0000 (18:00 +0000)]
Merge "Fix bootloops in TwilightService" 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
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
Jason Monk [Wed, 24 Feb 2016 17:56:16 +0000 (12:56 -0500)]
Fix bootloops in TwilightService
Bug:
27336023
Change-Id: I983f05bd69fd27bb3e3ae121d19fc9d006c95ffb
Jae Seo [Wed, 24 Feb 2016 17:53:46 +0000 (17:53 +0000)]
Merge "Enable to set canRecord and tunerCount statically" into nyc-dev
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.
Shishir Agrawal [Wed, 24 Feb 2016 17:35:44 +0000 (17:35 +0000)]
Merge "Add subscription specific TelephonyManager calls." into nyc-dev
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
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
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
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
Jeff Sharkey [Wed, 24 Feb 2016 16:55:36 +0000 (16:55 +0000)]
Merge "Don't try caching null ringtones." into nyc-dev
Jeff Sharkey [Wed, 24 Feb 2016 16:54:14 +0000 (09:54 -0700)]
Don't try caching null ringtones.
Bug:
27330629
Change-Id: Id09d10d6f4a3a20782480647c68a5c94ef69e7b3
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
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
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
Geoff Mendal [Wed, 24 Feb 2016 15:37:35 +0000 (15:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
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
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
Geoff Mendal [Wed, 24 Feb 2016 15:23:12 +0000 (15:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
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
Jason Monk [Wed, 24 Feb 2016 14:21:18 +0000 (14:21 +0000)]
Merge "Support changes in Settings for battery graph" 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
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
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
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
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
Michal Karpinski [Wed, 24 Feb 2016 12:12:25 +0000 (12:12 +0000)]
Merge "Removing lock contention in SecurityLogMonitor" into nyc-dev
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
Diego Perez [Wed, 24 Feb 2016 11:50:22 +0000 (11:50 +0000)]
Merge "Fix FontFamily nAddFontWeightStyle in nyc" 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
Tony Mak [Wed, 24 Feb 2016 11:08:38 +0000 (11:08 +0000)]
Should call clearCallingIdentity before accessing getProfileParent
Bug:
27308833
Change-Id: Ib33fcc0f30dada5f307f45c7c85dce5fb5e4a064
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
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
Rubin Xu [Wed, 24 Feb 2016 10:31:35 +0000 (10:31 +0000)]
Merge "Clarify javadoc for SecurityLog" into nyc-dev
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
Tomasz Mikolajewski [Wed, 24 Feb 2016 08:42:15 +0000 (08:42 +0000)]
Merge "Wire removeDocument() to Jobs." into 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
Pierre Imai [Wed, 24 Feb 2016 04:49:24 +0000 (04:49 +0000)]
Merge "Add Connectivity Metrics Logger service" into mm-wireless-dev
Selim Cinek [Wed, 24 Feb 2016 03:59:44 +0000 (03:59 +0000)]
Merge "Adapted the lockscreen style" into nyc-dev
Tomasz Mikolajewski [Tue, 23 Feb 2016 06:12:54 +0000 (15:12 +0900)]
Wire removeDocument() to Jobs.
Bug:
27303034
Change-Id: I6388e2b70b523670210cd8285800b4c187c8f8b8
Jeff Sharkey [Wed, 24 Feb 2016 03:17:10 +0000 (03:17 +0000)]
Merge "Update accessibility to be encryption-aware." into nyc-dev
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
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
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
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
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
Zhijun He [Wed, 24 Feb 2016 01:45:29 +0000 (01:45 +0000)]
Merge "ImageReader: override the flexible YUV compatible formats" 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
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
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
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
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
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
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
Jorim Jaggi [Wed, 24 Feb 2016 00:20:59 +0000 (19:20 -0500)]
Fix wrong measurement in DecorView
Bug:
27215338
Change-Id: I512df9b23788daf485b020a2199a55a7c6ab6311
Adam Powell [Wed, 24 Feb 2016 00:06:42 +0000 (16:06 -0800)]
Un-hide string set persistence methods in Preference
6 years is enough time for API approval.
Bug
27324328
Change-Id: I5d5af0fc291250cd9ea5b50cd5031378475eacec
Jae Seo [Tue, 23 Feb 2016 23:39:08 +0000 (23:39 +0000)]
Merge "TIF: Unhide URI util methods" into nyc-dev
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
Chris Craik [Tue, 23 Feb 2016 23:33:51 +0000 (23:33 +0000)]
Merge "Fix drawColor/drawPaint bounds" into nyc-dev
Jae Seo [Tue, 23 Feb 2016 22:57:02 +0000 (14:57 -0800)]
TIF: Unhide URI util methods
Bug:
27314735
Change-Id: Ib2aeb451a435bb959efb1cba359c335b051f88e5
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
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
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.
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
Doris Liu [Tue, 23 Feb 2016 22:43:52 +0000 (22:43 +0000)]
Merge "Support running AVD on UI thread" into nyc-dev
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
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
Anthony Chen [Tue, 23 Feb 2016 22:11:16 +0000 (22:11 +0000)]
Merge "Scale phone state icons." into nyc-dev
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
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
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
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
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
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
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
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
Nathan Harold [Tue, 23 Feb 2016 21:25:12 +0000 (13:25 -0800)]
Adding Error Codes for IWLAN/EPDG Connection
-Error codes related to tunnel maintenance
-Error code for DPD
Bug:
26014044
Bug:
26014458
Change-Id: Ic00a14e0502fa47e20e79a3c6ce91b3170f53a50
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
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.
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
Wale Ogunwale [Tue, 23 Feb 2016 20:50:49 +0000 (20:50 +0000)]
Merge "Clear calling identity on Session.startingMovingTask" 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