OSDN Git Service
Felipe Leme [Tue, 21 Mar 2017 16:58:40 +0000 (09:58 -0700)]
Autofill a manual request directly when it only has one dataset.
Tests:
- renamed testManualAutofill() to testManualAutofillOneDataset()
- added testManualAutofillTwoDatasetsPickFirst()
- added testManualAutofillTwoDatasetsPickSecond()
Bug:
35708229
Test: LoginActivityTest pass
Test: manual verification
Change-Id: I7aa60ab5df60decaf49d617bf3e9fcf3ab0074fa
Adam Lesinski [Tue, 21 Mar 2017 01:03:14 +0000 (01:03 +0000)]
Merge "AssetManager: Guard against null in array retrieval"
Pankaj Kanwar [Tue, 21 Mar 2017 00:45:50 +0000 (00:45 +0000)]
Merge "Updated javadocs for sendUssd APIs."
Winson Chung [Tue, 21 Mar 2017 00:28:57 +0000 (00:28 +0000)]
Merge "Update PiP AppOps flag to enforce all PiP functionality."
Winson Chung [Tue, 21 Mar 2017 00:28:57 +0000 (00:28 +0000)]
Merge "Showing notification when activity is in PiP."
Jin Qian [Tue, 21 Mar 2017 00:19:26 +0000 (00:19 +0000)]
Merge "Revert "Add remote callbacks for persistent vr mode""
Kevin Hufnagle [Tue, 21 Mar 2017 00:16:01 +0000 (00:16 +0000)]
Merge changes Ie70977f9,I45ef3001
* changes:
2-way cherry-pick from oc-preview-docs-release: docs: Updated ShortcutManager Javadoc for Android O Developer Preview.
docs: Edited ShortcutManager reference docs for Android O.
Adam Lesinski [Tue, 21 Mar 2017 00:15:25 +0000 (00:15 +0000)]
Merge "AAPT: Version <adaptive-icon> to v26"
Jeremy Klein [Tue, 21 Mar 2017 00:10:46 +0000 (00:10 +0000)]
Merge "In isTetheringSupported, call isAdmin user from system." am:
4a8953094f am:
23d6ba12f1
am:
0b8756e735
Change-Id: I76d02e97382c0332e3d93383d60e8e7fc9951a08
Jin Qian [Tue, 21 Mar 2017 00:04:53 +0000 (00:04 +0000)]
Revert "Add remote callbacks for persistent vr mode"
This reverts commit
504c6d67d0c2e4cda5201372551914f94acce710.
Change-Id: Ia0f8d508272211736d421cf097abaa0bcbc3abab
TreeHugger Robot [Tue, 21 Mar 2017 00:04:22 +0000 (00:04 +0000)]
Merge "Fine-grained systrace for NetworkPolicyManagerService"
Jeremy Klein [Tue, 21 Mar 2017 00:04:11 +0000 (00:04 +0000)]
Merge "In isTetheringSupported, call isAdmin user from system." am:
4a8953094f
am:
23d6ba12f1
Change-Id: I35f45927c564773c10da78e1476814f0a1c7f1be
Jeremy Klein [Mon, 20 Mar 2017 23:58:09 +0000 (23:58 +0000)]
Merge "In isTetheringSupported, call isAdmin user from system."
am:
4a8953094f
Change-Id: Ibefe655ed377c55322d871e02d87c0d001327da8
Jeremy Klein [Mon, 20 Mar 2017 23:50:57 +0000 (23:50 +0000)]
Merge "In isTetheringSupported, call isAdmin user from system."
Steven Thomas [Mon, 20 Mar 2017 23:43:46 +0000 (23:43 +0000)]
Merge "Add remote callbacks for persistent vr mode"
Eugene Susla [Mon, 20 Mar 2017 23:04:11 +0000 (23:04 +0000)]
Merge "Register PackageMonitor for CompanionDeviceManagerService"
TreeHugger Robot [Mon, 20 Mar 2017 22:56:18 +0000 (22:56 +0000)]
Merge "Ensure that we update the controller before setting menu visibility."
Jakub Pawlowski [Mon, 20 Mar 2017 22:41:06 +0000 (22:41 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)" am:
f0c963a5b6 am:
375741e99a
am:
d7714c45e0
Change-Id: I71d5455248a9840aadf02859ba8652bd80eca559
TreeHugger Robot [Mon, 20 Mar 2017 22:37:20 +0000 (22:37 +0000)]
Merge "More RecoverableSecurityException docs."
TreeHugger Robot [Mon, 20 Mar 2017 22:35:36 +0000 (22:35 +0000)]
Merge "Allow setting a persistent VR thread."
Jakub Pawlowski [Mon, 20 Mar 2017 22:33:09 +0000 (22:33 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)" am:
f0c963a5b6
am:
375741e99a
Change-Id: Ieb03aed00cee20c367f52aa8ea1b1fd02a6fbbac
Jakub Pawlowski [Mon, 20 Mar 2017 22:26:42 +0000 (22:26 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)"
am:
f0c963a5b6
Change-Id: Ia401ccf8935b8cb315849803c5c82d1d7dd64b81
Jakub Pawlowski [Mon, 20 Mar 2017 22:19:07 +0000 (22:19 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)"
Makoto Onuki [Mon, 20 Mar 2017 21:53:00 +0000 (14:53 -0700)]
Fine-grained systrace for NetworkPolicyManagerService
Bug
34961340
Test: manual test with systrace.py
Change-Id: I6b0e53758d80db1ed9e522f82fff9ccc16301fb0
Sid Soundararajan [Mon, 20 Mar 2017 22:17:06 +0000 (22:17 +0000)]
Merge "Add Long Press to Launch All Apps View"
Winson Chung [Fri, 17 Mar 2017 19:34:12 +0000 (12:34 -0700)]
Update PiP AppOps flag to enforce all PiP functionality.
- Previously it only enforced whether an app could enter PiP as it was
hiding.
- Also updating metrics constant name to reflect the change.
- Adding public OPSTR for apps to check if it the user has disabled PiP
Bug:
35957404
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I979b5c6d4c85946623999ced1cfb197d830ccecb
TreeHugger Robot [Mon, 20 Mar 2017 22:03:16 +0000 (22:03 +0000)]
Merge "Batch autofill() calls to views with virtual children."
Jeremy Klein [Fri, 17 Mar 2017 21:30:02 +0000 (14:30 -0700)]
In isTetheringSupported, call isAdmin user from system.
This avoids requiring the MANAGE_USERS permission in this function.
Bug:
32671528
Test: Manual. Also seeking unit test guidance from reviewer.
Change-Id: I841e721013b0e4b6db34d629a1e97b3cd54cd73b
Kevin Hufnagle [Sat, 18 Mar 2017 01:11:20 +0000 (18:11 -0700)]
2-way cherry-pick from oc-preview-docs-release: docs: Updated ShortcutManager Javadoc for Android O Developer Preview.
Test: make ds-docs -j12
Bug:
34685739
Change-Id: Ie70977f9b7b5b08de8bdd583a1e21b8a00eb5970
Original-Change-Id: I3cfa360ebd025a7eb198d7fe54f96059f42cd7f5
Original-Change-Id: I45ef30010f696604c06ce2cd7e2eca1db012e68b
Jerry Zhang [Mon, 20 Mar 2017 21:54:28 +0000 (21:54 +0000)]
Merge "Add support for MTP perceived device type property." am:
b6ed343e85 am:
7644b885c7
am:
136f37b88f
Change-Id: I446cd52e5fd8cda48e9af46ee3faee5578cae286
Bryce Lee [Mon, 20 Mar 2017 21:48:47 +0000 (21:48 +0000)]
Merge "Do not defer wm display logic when called from am."
Jerry Zhang [Mon, 20 Mar 2017 21:46:01 +0000 (21:46 +0000)]
Merge "Add support for MTP perceived device type property." am:
b6ed343e85
am:
7644b885c7
Change-Id: If09ce7609ff999c7dc32d7cc5db4917eae50748c
Jerry Zhang [Mon, 20 Mar 2017 21:39:17 +0000 (21:39 +0000)]
Merge "Add support for MTP perceived device type property."
am:
b6ed343e85
Change-Id: I58417625aa6c669eb82af3a11a4e35c77952f539
TreeHugger Robot [Mon, 20 Mar 2017 21:25:30 +0000 (21:25 +0000)]
Merge "Add token to the resolver APIs"
Kevin Hufnagle [Fri, 17 Mar 2017 00:22:14 +0000 (17:22 -0700)]
docs: Edited ShortcutManager reference docs for Android O.
Added descriptions of features that have been added or have changed
within the ShortcutManager class.
Bug:
34685739
Change-Id: I45ef30010f696604c06ce2cd7e2eca1db012e68b
David Stevens [Mon, 20 Mar 2017 21:23:18 +0000 (21:23 +0000)]
Merge "Prefer to launch activities on the source display"
Treehugger Robot [Mon, 20 Mar 2017 21:23:10 +0000 (21:23 +0000)]
Merge "Add support for MTP perceived device type property."
Winson Chung [Mon, 20 Mar 2017 21:01:36 +0000 (14:01 -0700)]
Ensure that we update the controller before setting menu visibility.
Bug:
36444329
Test: Launch PIP with media session, expand to see menu
Change-Id: I8ca4d459a2989c93c4300ac687dce298f4233822
Eugene Susla [Mon, 13 Mar 2017 19:57:58 +0000 (12:57 -0700)]
Register PackageMonitor for CompanionDeviceManagerService
1. On package removed -> remove all its associations
2. On package updated -> if had associations, update special access permission
in accordance with (potentially changed) permission entries in manifest
Bug:
30932767
Test: 1. Remove app, and ensure xml entries for it got removed.
2. adb install new version of app without special permissions in manifest, and
ensure whitelist removal method got called
Change-Id: I87261c05ddcf40a18332d160b44ee2f8284df5e4
Jeff Sharkey [Mon, 20 Mar 2017 20:38:04 +0000 (14:38 -0600)]
More RecoverableSecurityException docs.
Mention convenience methods in class docs, and require a valid
NotificationChannel to be provided to match O best-practices.
Also mention that notifyChange() should be triggered when the action
is finished.
Test: builds, boots
Bug:
34676491
Change-Id: I0e6c6d43a93cbce1a5de02621290cc2ff9423274
pkanwar [Mon, 20 Mar 2017 19:23:42 +0000 (12:23 -0700)]
Updated javadocs for sendUssd APIs.
Bug:
35766546
Change-Id: I40f0addc15331184b3409b3d1b5c9dc1455d8b5b
Test: manual
Craig Donner [Wed, 8 Mar 2017 17:51:47 +0000 (09:51 -0800)]
Allow setting a persistent VR thread.
Bug:
36215076
Test: adb shell am instrument -w -e class \
android.os.SetPersistentVrThreadTest \
com.android.frameworks.coretests/\
android.support.test.runner.AndroidJUnitRunner
cts-tradefed run cts -m CtsVrTestCases -t android.vr.cts.VrSetFIFOThreadTest
Change-Id: If2f3a5f1c8593c74ac35964f68dcbe75b4da472e
TreeHugger Robot [Mon, 20 Mar 2017 20:02:13 +0000 (20:02 +0000)]
Merge "Apps must opt into using icon badges."
Jakub Pawlowski [Fri, 17 Mar 2017 22:33:27 +0000 (15:33 -0700)]
Bluetooth 5 AdvertisingSet implementation (1/4)
Test: manual
Bug:
30622771
Change-Id: Ia89718c0c2ab2eaa71b158ecdcae989af907769f
TreeHugger Robot [Mon, 20 Mar 2017 19:57:14 +0000 (19:57 +0000)]
Merge "StartHidlServices wait for StartSensorService."
TreeHugger Robot [Mon, 20 Mar 2017 19:52:37 +0000 (19:52 +0000)]
Merge "Expose AIRPLANE_MODE_ON to Instant Apps"
TreeHugger Robot [Mon, 20 Mar 2017 19:47:42 +0000 (19:47 +0000)]
Merge "Expose Intents to Instant Apps"
Selim Cinek [Mon, 20 Mar 2017 19:35:23 +0000 (19:35 +0000)]
Merge changes from topic 'revert_dozing'
* changes:
Revert "NotificationWrappers: Factor out doze treatment"
Revert "AOD: Use color filter to invert icons for AOD"
TreeHugger Robot [Mon, 20 Mar 2017 19:29:04 +0000 (19:29 +0000)]
Merge "Expose Android ID to Instant Apps"
TreeHugger Robot [Mon, 20 Mar 2017 19:23:04 +0000 (19:23 +0000)]
Merge "use SkVertices::Builder in drawBitmapLattice override new virtual onDrawVerticesObject"
TreeHugger Robot [Mon, 20 Mar 2017 19:00:45 +0000 (19:00 +0000)]
Merge "Add android:label to ExternalStorageProvider."
Yifan Hong [Mon, 20 Mar 2017 17:57:44 +0000 (10:57 -0700)]
StartHidlServices wait for StartSensorService.
Otherwise, StartHidlServices waits for more than a second
while holding a lock, delaying window manager.
Test: boots
Test: SystemServerTiming_StartWindowManagerService does not regress
Logcat shows:
SystemServerTimingAsync: StartSensorService took to complete: 55ms
SystemServerTiming: StartWindowManagerService took to complete: 81ms
SystemServerTiming: StartHidlServices took to complete: 1ms
Test: lshal shows android.frameworks.sensorservice@1.0::ISensorManager
Bug:
36389997
Change-Id: Iab5cf0ad7059cf9736cc7db0567dff51cc427b58
Todd Kennedy [Fri, 17 Mar 2017 23:03:29 +0000 (16:03 -0700)]
Add token to the resolver APIs
Change-Id: Ia6d4f6d88ec265480a4dca94fe77ef42592a328c
Fixes:
35442315
Test: Build and make sure instant apps still resolve
Chad Brubaker [Mon, 20 Mar 2017 18:11:30 +0000 (11:11 -0700)]
Expose AIRPLANE_MODE_ON to Instant Apps
Test: AIRPLANE_MODE_ON is accessible from Instant Apps
Bug:
36444225
Change-Id: I9ab2c89844d2bd202924156a5e44ef40075fd467
Chad Brubaker [Tue, 14 Mar 2017 17:23:02 +0000 (10:23 -0700)]
Expose Intents to Instant Apps
This exposes Intents used by Android widgets to Instant Apps.
The following Intents are exposed:
Intent.ACTION_TIME_TICK
Intent.ACTION_DATE_CHANGED
Intent.ACTION_TIMEZONE_CHANGED
Intent.ACTION_TIME_CHANGED
Intent.ACTION_CONFIGURATION_CHANGED
Intent.ACTION_LOCALE_CHANGED
Intent.ACTION_SCREEN_OFF
Intent.ACTION_SCREEN_ON
Intent.ACTION_USER_PRESENT
Bug:
33350280
Test: Manually verified that broadcasts are received.
Change-Id: Ife94f594c1ff30f2625a57e1cc69f36cc00d1f34
TreeHugger Robot [Mon, 20 Mar 2017 18:07:38 +0000 (18:07 +0000)]
Merge "Load DevicePolicyManager only when needed in LockSettingsService"
Christine Franks [Mon, 20 Mar 2017 18:03:44 +0000 (18:03 +0000)]
Merge "Add color temperature preference for Night Display"
Chad Brubaker [Mon, 20 Mar 2017 17:52:52 +0000 (10:52 -0700)]
Expose Android ID to Instant Apps
Android ID in O is scoped per-app but persistent across
installs. Since Instant Apps can use the cookie to implement similar
functionality its fine to expose.
In a follow up the Android ID generation will be made to depend on the
cookie so that clearing the cookie also breaks the persistence.
Bug:
36385889
Test: Manual
Change-Id: I09b993bb4153179b80eebe0da8dac3fad7b9c779
Yifan Hong [Mon, 20 Mar 2017 17:51:09 +0000 (17:51 +0000)]
Merge "IUsb uses "default" service name"
Selim Cinek [Mon, 20 Mar 2017 17:44:48 +0000 (17:44 +0000)]
Revert "NotificationWrappers: Factor out doze treatment"
Bug:
36430936
This reverts commit
edfb65bbc4eb0453c91355c9c2277fe5e96b135b.
Change-Id: I85f67d2f703bdc1bb8f2bedc19eacb5320b3c1d3
Sid Soundararajan [Wed, 15 Mar 2017 23:24:24 +0000 (16:24 -0700)]
Add Long Press to Launch All Apps View
Test: On TV long-press HOME will bring a panel on the right
(left on RTL), showing a grid of apps.
BUG:
35806605
Change-Id: Ia2aec6b17e9522b9e6f1450f9d58f6a095d3ccf7
Selim Cinek [Mon, 20 Mar 2017 17:43:50 +0000 (17:43 +0000)]
Revert "AOD: Use color filter to invert icons for AOD"
Bug:
36430936
This reverts commit
cc957752970c05de64272f33176395dfa2840486.
Change-Id: I1aa4a05d0bc823e02338693e1bf20786dd2ac019
Philip P. Moltmann [Mon, 20 Mar 2017 17:41:26 +0000 (17:41 +0000)]
Merge "Handle corrupted files when cutting out pages"
TreeHugger Robot [Mon, 20 Mar 2017 17:37:06 +0000 (17:37 +0000)]
Merge "Notify caller if none of settings are effective."
Bryce Lee [Mon, 20 Mar 2017 17:37:12 +0000 (10:37 -0700)]
Do not defer wm display logic when called from am.
Currently we process any remove/add/change logic from the activity
manager to the window manager through a handler message. This opens
the possibility of the activity manager requesting display state
from a window manager that is a step behind.
This change modifies the call behavior so that these changes are done
synchronously between the two managers.
Change-Id: Icd19f37c62bfb7aad10fab2e1b21e41ac75052b5
Fixes:
35741135
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests#testCreateMultipleVirtualDisplaysH
Su, Weihua [Mon, 20 Mar 2017 17:25:48 +0000 (17:25 +0000)]
Merge "Fix crash issue on Storage Manager app" am:
cb4a3c55cf am:
69be98ae52
am:
5fc179b22d
Change-Id: I13a5780d407f596a7026d36d55130fa98eb0882f
Ryuki Nakamura [Mon, 20 Mar 2017 17:24:37 +0000 (17:24 +0000)]
Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()" am:
a6ce3f3021 am:
900620cffc
am:
06659047f0
Change-Id: Ia7c8309f68d85a88e2a26169509d3e45d4d2ff69
Julia Reynolds [Mon, 20 Mar 2017 14:18:49 +0000 (10:18 -0400)]
Apps must opt into using icon badges.
Test: make
Bug:
35941623
Change-Id: Ifdbbed2097228d1121f3eb03ecab9851d23a023f
Ben Lin [Fri, 17 Mar 2017 18:10:46 +0000 (11:10 -0700)]
Add android:label to ExternalStorageProvider.
Test: Builds.
Bug:
30138665
Change-Id: I6ac028f97c1451f9d78f7f5a0960f1a3f8bde5b7
Jorim Jaggi [Mon, 20 Mar 2017 17:19:08 +0000 (17:19 +0000)]
Merge "Remove thumbnail cache"
Su, Weihua [Mon, 20 Mar 2017 17:18:40 +0000 (17:18 +0000)]
Merge "Fix crash issue on Storage Manager app" am:
cb4a3c55cf
am:
69be98ae52
Change-Id: Iaa7f97df590cbf93e1d5c942dae5f3be55988f11
Winson Chung [Fri, 17 Mar 2017 19:27:30 +0000 (12:27 -0700)]
Showing notification when activity is in PiP.
- Adding callback to SystemUI to be notified which package entered PiP,
and when it leaves PiP.
- Showing a BTW notification on a new PiP-specific channel.
Bug:
36070720
Test: Launch PiP, observe notification, leave PiP, observe no notification
Change-Id: Ibe10298288fe0464d7d136f2571e855f3f5c70ea
Su, Weihua [Mon, 20 Mar 2017 17:12:40 +0000 (17:12 +0000)]
Merge "Fix crash issue on Storage Manager app"
am:
cb4a3c55cf
Change-Id: If33e23972770c50cf83a42d8621d31b15b945524
Ryuki Nakamura [Mon, 20 Mar 2017 17:12:39 +0000 (17:12 +0000)]
Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()" am:
a6ce3f3021
am:
900620cffc
Change-Id: I730e7c550b88325a418c419340e6f98080f89969
Daniel Nishi [Mon, 20 Mar 2017 17:06:58 +0000 (17:06 +0000)]
Merge "Query app info as user for cache."
Treehugger Robot [Mon, 20 Mar 2017 17:05:18 +0000 (17:05 +0000)]
Merge "Fix crash issue on Storage Manager app"
Ryuki Nakamura [Mon, 20 Mar 2017 17:05:16 +0000 (17:05 +0000)]
Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()"
am:
a6ce3f3021
Change-Id: I3f43b25622e5052e6336983da84b92e12f3e06dc
Treehugger Robot [Mon, 20 Mar 2017 16:54:35 +0000 (16:54 +0000)]
Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()"
TreeHugger Robot [Mon, 20 Mar 2017 16:34:34 +0000 (16:34 +0000)]
Merge "Remove unused using statement."
TreeHugger Robot [Mon, 20 Mar 2017 16:25:16 +0000 (16:25 +0000)]
Merge "Don't backup deleted channels."
TreeHugger Robot [Mon, 20 Mar 2017 16:24:45 +0000 (16:24 +0000)]
Merge "Inline Notification Controls to full spec"
Christine Franks [Mon, 13 Feb 2017 17:48:00 +0000 (09:48 -0800)]
Add color temperature preference for Night Display
Bug:
32463283
Test: adb shell settings put secure night_display_color_temperature
XXXX, where XXXX is {0, 2900, 4000, 7000}, and the temperatures
outside the valid range are capped at the min/max, respectively.
Change-Id: I322c0a907b30742fc312a9938fd0c47f679e580b
Jean-Michel Trivi [Mon, 20 Mar 2017 15:47:58 +0000 (08:47 -0700)]
NotificationPlayer: fix typo in log
Test: n/a
Change-Id: I585f6ad39ef6dc0a93651deae6ca50051f732a1b
Jean-Michel Trivi [Mon, 20 Mar 2017 15:39:08 +0000 (15:39 +0000)]
Merge "NotificationPlayer: fix error listener, sync in playback thread"
Steven Moreland [Mon, 20 Mar 2017 14:56:34 +0000 (07:56 -0700)]
Remove unused using statement.
Test: pass
Bug:
36099713
Change-Id: I07b90f9592fdd6b9c58ee52dc4f49f5e8b9f3459
Julia Reynolds [Sat, 18 Mar 2017 17:42:09 +0000 (13:42 -0400)]
Don't backup deleted channels.
Change-Id: I58a23700c9f6ccf5d3d6b7fa9f80be78ef9421f0
Fixes:
36381209
Test: runtest systemui-notification
Geoffrey Pitsch [Thu, 16 Feb 2017 15:51:18 +0000 (10:51 -0500)]
Inline Notification Controls to full spec
Based off redline spec
Support bundled notifications when long-press on summary
Hide banned text when sent from the default channel
Test: runtest systemui
Change-Id: I9315b4dc12cafbdf37ba9896879bfbe23c8d6921
Ben Wagner [Mon, 20 Mar 2017 14:17:48 +0000 (14:17 +0000)]
Merge "Use access directly instead of sk_exists."
Mike Reed [Fri, 17 Mar 2017 14:15:52 +0000 (10:15 -0400)]
use SkVertices::Builder in drawBitmapLattice
override new virtual onDrawVerticesObject
Test: CtsGraphicsTestCases
Change-Id: I38e3ee0aa2a1ee9c11474c2c5d648ee5fca20d78
Rubin Xu [Mon, 20 Mar 2017 12:36:35 +0000 (12:36 +0000)]
Load DevicePolicyManager only when needed in LockSettingsService
Since DevicePolicyManager is published later than LockSettingsService,
we shouldn't be getting DevicePolicyManager when LockSettingsService is
being constructed.
Bug:
36424241
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedProfileOwnerTest#testResetPasswordWithToken
Change-Id: I5e9da78e4fe802c70d34dc3c9dae4f2677ed631d
Philipp Weiß [Mon, 20 Mar 2017 12:03:03 +0000 (12:03 +0000)]
Merge "Finalize Strings and Icon for Network Logging Notification"
Narayan Kamath [Mon, 20 Mar 2017 11:12:10 +0000 (11:12 +0000)]
Merge "TelephonyManager: Avoid unnecessary object allocation." am:
5d3f14fe02 am:
088df2bd0a
am:
20fa635f7b
Change-Id: I1008a22a437b46d4830ef89189d43db0e3d07c45
Narayan Kamath [Mon, 20 Mar 2017 11:04:17 +0000 (11:04 +0000)]
Merge "TelephonyManager: Avoid unnecessary object allocation." am:
5d3f14fe02
am:
088df2bd0a
Change-Id: I0af6c22b2c7418553a70d49f9d67393b51abd37f
Narayan Kamath [Mon, 20 Mar 2017 10:57:52 +0000 (10:57 +0000)]
Merge "TelephonyManager: Avoid unnecessary object allocation."
am:
5d3f14fe02
Change-Id: If425a64fe7820579045dfa40b356792f24d0de43
Andrei Stingaceanu [Mon, 20 Mar 2017 10:53:39 +0000 (10:53 +0000)]
Merge "AutoSize TextView (part 12) - ellipsize & more fixes"
Narayan Kamath [Mon, 20 Mar 2017 10:49:16 +0000 (10:49 +0000)]
Merge "TelephonyManager: Avoid unnecessary object allocation."
Roozbeh Pournader [Mon, 20 Mar 2017 02:59:20 +0000 (02:59 +0000)]
Merge "Read emoji addtions from data file"
TreeHugger Robot [Sun, 19 Mar 2017 03:28:02 +0000 (03:28 +0000)]
Merge "Grumble, apps should check features before using."
TreeHugger Robot [Sun, 19 Mar 2017 01:45:48 +0000 (01:45 +0000)]
Merge "Use allocatable space when measuring for install."
Charlie Tsai [Sun, 19 Mar 2017 01:18:34 +0000 (01:18 +0000)]
Merge "Replace rectangle shadow algorithm"