OSDN Git Service
Ying Xu [Fri, 23 Jun 2017 20:52:50 +0000 (20:52 +0000)]
Merge "Add flag to wipe eUICC data" into oc-dr1-dev
Lucas Dupin [Fri, 23 Jun 2017 19:20:35 +0000 (19:20 +0000)]
Merge "Fix notification contrast with transparent bg" into oc-dev
am:
9b73401191
Change-Id: Iabd5160cdc09c36d7f565079f9dfd09969529c88
Lucas Dupin [Fri, 23 Jun 2017 19:11:11 +0000 (19:11 +0000)]
Merge "Fix notification contrast with transparent bg" into oc-dev
Brad Ebinger [Fri, 23 Jun 2017 18:32:08 +0000 (18:32 +0000)]
Merge "Add method that checks the Binder status of ImsConfig" into oc-dr1-dev
TreeHugger Robot [Fri, 23 Jun 2017 18:18:58 +0000 (18:18 +0000)]
Merge changes from topic 'wrong_password' into oc-dr1-dev
* changes:
SettingsLib: set network status for wrong password error
wifi: add "wrong password" network disabled reason
yinxu [Mon, 19 Jun 2017 17:28:19 +0000 (10:28 -0700)]
Add flag to wipe eUICC data
Add a new flag in the DevicePolicyManager so that we can Use
EuiccManager#eraseSubscriptions(PendingIntent) to erase all the carrier data
from eUICC chip if the user choose to "ERASE" from the Android device manager.
Bug:
37277944
Test: E2E
Change-Id: Ia78090a00d956c645725be4fd591e02ded8ec467
Siddharth Ray [Fri, 23 Jun 2017 17:19:37 +0000 (17:19 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dev
am:
2ffd98670f -s ours
Change-Id: I44d903a9ce1a53faa9e1633cc8d69e322454704d
TreeHugger Robot [Fri, 23 Jun 2017 17:12:22 +0000 (17:12 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dev
Lucas Dupin [Fri, 23 Jun 2017 16:30:49 +0000 (09:30 -0700)]
Fix notification contrast with transparent bg
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java
Change-Id: I2f0595408be61acb8267bb7449486ee46f7aad19
Fixes:
62937149
Meng Wang [Fri, 23 Jun 2017 16:00:50 +0000 (16:00 +0000)]
Merge "Show error code in WFC error messages." into oc-dr1-dev
Bill Yi [Fri, 23 Jun 2017 15:21:28 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
b39c08f9d7 -s ours
Change-Id: I32484f5c5715c17c439d5ff20fcd8e46b8061c18
TreeHugger Robot [Fri, 23 Jun 2017 15:12:07 +0000 (15:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Fri, 23 Jun 2017 15:11:46 +0000 (15:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 23 Jun 2017 15:01:06 +0000 (15:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Fri, 23 Jun 2017 12:49:11 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d406f38d24 -s ours
Change-Id: I45a76be2cec8829147d9ac4569da2087bf6722bd
TreeHugger Robot [Fri, 23 Jun 2017 12:42:32 +0000 (12:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Android Build Merger (Role) [Fri, 23 Jun 2017 12:37:23 +0000 (12:37 +0000)]
Merge "Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev am:
cd73cc4c6d" into oc-dr1-dev
TreeHugger Robot [Fri, 23 Jun 2017 12:36:43 +0000 (12:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Winson Chung [Fri, 23 Jun 2017 12:35:23 +0000 (12:35 +0000)]
Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev
am:
cd73cc4c6d
Change-Id: I322cf9616694457762181657a2b51f8a3aff5911
Android Build Merger (Role) [Fri, 23 Jun 2017 12:29:41 +0000 (12:29 +0000)]
Merge "Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev am:
db11f55cb7" into oc-dr1-dev
Neil Fuller [Fri, 23 Jun 2017 12:28:31 +0000 (12:28 +0000)]
Merge "Stop loading other package's font by default." into oc-dr1-dev
Roshan Pius [Fri, 23 Jun 2017 12:28:27 +0000 (12:28 +0000)]
Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev
am:
db11f55cb7
Change-Id: Id9cb3a6211cf516875c6ad4ac10058bb352ebd46
Seigo Nonaka [Fri, 23 Jun 2017 12:23:36 +0000 (12:23 +0000)]
Merge "Stop loading other package's font by default." into oc-dev
am:
824d75e0e1 -s ours
Change-Id: Ib6375fdfa9295add1e4d53f220f3b8d22f48b855
Seigo Nonaka [Thu, 22 Jun 2017 15:22:18 +0000 (08:22 -0700)]
Stop loading other package's font by default.
Since CONTEXT_RESTRICTED is not a default flag of createPackageContext,
we can't rely on it for preventing unexpected font injections.
To protect developers and existing apps from a risk of font injection,
stop loading font from other package's resouce unless the developer
explicitly set CONTEXT_IGNORE_SECURITY.
Bug:
62813533
Bug:
62879353
Test: Manually done
Merged-In: I4442ddc48dadb5c968b444be86038b602074d301
Change-Id: I4442ddc48dadb5c968b444be86038b602074d301
(cherry picked from commit
6d6cd68660635d670b0cb17f348b7c1da13704b3)
Bill Yi [Fri, 23 Jun 2017 07:43:50 +0000 (00:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib851156b7d64c1f1c3ea398dc1d80602219d2c0f
Auto-generated-cl: translation import
Bill Yi [Fri, 23 Jun 2017 07:39:00 +0000 (00:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iadf46b732ac29fc836edaf04a53062fb554a3b6a
Auto-generated-cl: translation import
Bill Yi [Fri, 23 Jun 2017 05:35:07 +0000 (22:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I78bf0588f7daa39637f7e64922fad7081229d0a3
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 23 Jun 2017 05:16:08 +0000 (05:16 +0000)]
Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev
TreeHugger Robot [Fri, 23 Jun 2017 04:26:45 +0000 (04:26 +0000)]
Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev
Daniel Nishi [Fri, 23 Jun 2017 04:19:13 +0000 (04:19 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev
am:
f14c1e12cf
Change-Id: Ied7c80b4b9e58fa0d5b31e7a7bce33028e55337b
TreeHugger Robot [Fri, 23 Jun 2017 04:10:42 +0000 (04:10 +0000)]
Merge "Stop loading other package's font by default." into oc-dev
TreeHugger Robot [Fri, 23 Jun 2017 04:09:32 +0000 (04:09 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev
Bill Yi [Fri, 23 Jun 2017 03:47:22 +0000 (20:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8e7e2885713047eef21b2885aa82aec71a5f5aa8
Auto-generated-cl: translation import
Bill Yi [Fri, 23 Jun 2017 03:30:02 +0000 (20:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia7eaecd7d11d7c8d5779009e32885c93ad7e8e2f
Auto-generated-cl: translation import
Wale Ogunwale [Fri, 23 Jun 2017 02:19:25 +0000 (02:19 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev
am:
b55b842898
Change-Id: I36a34d029f75195d4a865affef5257f1d4aa5d50
TreeHugger Robot [Fri, 23 Jun 2017 02:10:32 +0000 (02:10 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev
Seigo Nonaka [Thu, 22 Jun 2017 15:22:18 +0000 (08:22 -0700)]
Stop loading other package's font by default.
Since CONTEXT_RESTRICTED is not a default flag of createPackageContext,
we can't rely on it for preventing unexpected font injections.
To protect developers and existing apps from a risk of font injection,
stop loading font from other package's resouce unless the developer
explicitly set CONTEXT_IGNORE_SECURITY.
This CL contains Iac2a6fb3d82ef23d5ca6ee33f4aaa9ed28455271 by manual
merging to handle repository split.
Bug:
62813533
Bug:
62879353
Test: Manually done
Merged-In: I4442ddc48dadb5c968b444be86038b602074d301
Change-Id: I4442ddc48dadb5c968b444be86038b602074d301
TreeHugger Robot [Fri, 23 Jun 2017 01:58:19 +0000 (01:58 +0000)]
Merge "Log call to setPortRoles" into oc-dr1-dev
Daniel Nishi [Fri, 23 Jun 2017 01:53:03 +0000 (18:53 -0700)]
Add in the getCacheQuotaBytes method to wrapper.
Bug:
62623731
Test: Settings Unit Test
Change-Id: Ibd779c7d9e60c44440483489b231ba0715321bc1
Felipe Leme [Fri, 23 Jun 2017 00:36:35 +0000 (00:36 +0000)]
Improved documentation for AutofillService package:
am:
2ef19c1d73
Change-Id: I67d6649d4acb84ebb598c1ebceb3c3ed58cfd0c0
Wale Ogunwale [Thu, 22 Jun 2017 23:43:53 +0000 (16:43 -0700)]
Dump user id in dumpsys activity starter
To help with ANR debugging.
Test: adb shell dumpsys activity starter
Bug:
38121026
Change-Id: I96d530662e6a362b817df3ca8410cb173a2c0dd4
Badhri Jagan Sridharan [Thu, 22 Jun 2017 23:39:47 +0000 (16:39 -0700)]
Log call to setPortRoles
Came of bunch of bugs, for instance b/
62912250 where some app is
forcing the port role. Logging which package is doing this
Change-Id: I234db3292326d247c82723989b46160fcbd59c10
Charlie Wang [Thu, 22 Jun 2017 23:35:20 +0000 (23:35 +0000)]
Merge "Adding tron logging events for standalone headsets." into oc-dr1-dev
Roshan Pius [Thu, 22 Jun 2017 18:36:53 +0000 (11:36 -0700)]
WifiEnterpriseConfig: New copy method to ignore masked password
To ignore the masked password sent by apps, add a new copy-constructor
equivalent method which will ignore the masked password.
Bug:
62893342
Test: Unit tests.
Test: Manual tests with the linked CL.
Test: Regression tests.
Change-Id: Ib208dcd94a888e07a9b3dc0442620233ea7791e5
Ying Xu [Thu, 22 Jun 2017 23:19:57 +0000 (23:19 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode." into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 22:59:41 +0000 (22:59 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dr1-dev
Stephen Chen [Wed, 7 Jun 2017 22:49:13 +0000 (15:49 -0700)]
Add strings for revamped Wi-Fi ONA notification.
Bug:
37357441
Test: n/a
Change-Id: Ib32581f044db9827a700be8af1864af15f6dbb3e
Todd Kennedy [Thu, 22 Jun 2017 22:26:34 +0000 (22:26 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev
am:
16503a8f7e
Change-Id: Ia20de35097f3b5b139afc5ccee59d71584f59a3a
Felipe Leme [Mon, 5 Jun 2017 18:32:32 +0000 (11:32 -0700)]
Improved documentation for AutofillService package:
- Moved (and expanded) overall documentation from FillResponse to
AutofillService.
- Improved SaveInfo documentation.
- Improved FillRequest documentation.
- Improved Dataset documentation.
Bug:
37567048
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML
Change-Id: I157893deac06a5ed5e1cb7fd082da485f227b9ee
Rob Carr [Thu, 22 Jun 2017 22:23:19 +0000 (22:23 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev
am:
82b41e460c
Change-Id: I47c8e096ccd513eb65fa9fd2a34fc75fa222a42c
TreeHugger Robot [Thu, 22 Jun 2017 22:11:44 +0000 (22:11 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev
Rob Carr [Thu, 22 Jun 2017 22:08:03 +0000 (22:08 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev
Shubang [Thu, 22 Jun 2017 21:44:18 +0000 (21:44 +0000)]
Merge "Change PIP notification icon" into oc-dev
am:
9f3967fee1
Change-Id: I5c42cb241ef98bc5e70b03d460230e3ac2115240
TreeHugger Robot [Thu, 22 Jun 2017 21:33:39 +0000 (21:33 +0000)]
Merge "Add tintable icon support" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 21:31:56 +0000 (21:31 +0000)]
Merge "Change PIP notification icon" into oc-dev
TreeHugger Robot [Thu, 22 Jun 2017 20:20:39 +0000 (20:20 +0000)]
Merge "Make default status bar padding 8dp" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 20:19:04 +0000 (20:19 +0000)]
Merge "GnssLocationProvider: listening to conn lost event" into oc-dr1-dev
Siddharth Ray [Wed, 21 Jun 2017 22:14:44 +0000 (15:14 -0700)]
Emergency SUPL when location is disabled
A cycle of native_init() and native_cleanup() is needed so that
callbacks are registered after bootup even when location is disabled.
This will allow Emergency SUPL to work even when location is disabled
before device restart.
Merged-In: I423d5a7142709fc0579be009bb8b14d3778aa090
BUG:
38362097
Change-Id: I423d5a7142709fc0579be009bb8b14d3778aa090
Siddharth Ray [Wed, 21 Jun 2017 22:14:44 +0000 (15:14 -0700)]
Emergency SUPL when location is disabled
A cycle of native_init() and native_cleanup() is needed so that
callbacks are registered after bootup even when location is disabled.
This will allow Emergency SUPL to work even when location is disabled
before device restart.
BUG:
38362097
Change-Id: I423d5a7142709fc0579be009bb8b14d3778aa090
TreeHugger Robot [Thu, 22 Jun 2017 20:00:23 +0000 (20:00 +0000)]
Merge "Better merge fix for empty state signal drawable" into oc-dr1-dev
Charlie Wang [Wed, 14 Jun 2017 21:46:39 +0000 (14:46 -0700)]
Adding tron logging events for standalone headsets.
Standalone headsets will use tron to log headset events.
Bug:
62103076
Test: Builds and logger can log events
Change-Id: I761ddae4501aa8b8d0d9dacc91f04fd13a2c771c
Wale Ogunwale [Thu, 22 Jun 2017 19:45:21 +0000 (19:45 +0000)]
Merge "Added more systrace points to window manager" into oc-dev
am:
182d5ec2d2
Change-Id: I6a1ac4ceee2ba943965382fc5cb7c782249b19a2
Todd Kennedy [Thu, 22 Jun 2017 19:40:39 +0000 (12:40 -0700)]
Allow any app to dynamically install a split
Any application starting an activity resolved to a dyanmic split
should initiate split installation. Previously, only the application
defining the split could start installation of the split.
Bug:
62872325
Test: Manual; install instant app and start intent using 'adb shell am' and see that dynamic split installation occurs
Change-Id: I232dc5df82fb2c04653015a4a6b9f07c9e382205
TreeHugger Robot [Thu, 22 Jun 2017 19:30:40 +0000 (19:30 +0000)]
Merge "Added more systrace points to window manager" into oc-dev
TreeHugger Robot [Thu, 22 Jun 2017 19:29:58 +0000 (19:29 +0000)]
Merge "Add API to allow apps more control over instantiation" into oc-dr1-dev
Robert Carr [Wed, 21 Jun 2017 17:25:05 +0000 (10:25 -0700)]
ListPopupWindow: Wrap new bounds checking in targetSdk check.
While a negative height is pretty silly, crashing apps on
the new version of android makes them sad.
Test: Existing CTS passes.
Bug:
62434804
Change-Id: I5fc3fc50fb6ccfa9e96f38ded4fb8e338f263f09
TreeHugger Robot [Thu, 22 Jun 2017 18:52:45 +0000 (18:52 +0000)]
Merge "Bring back transparency for QS" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 18:46:07 +0000 (18:46 +0000)]
Merge "Add metric for anomaly action" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 18:41:57 +0000 (18:41 +0000)]
Merge "Add test for StatusBar.dump" into oc-dr1-dev
Brad Ebinger [Thu, 22 Jun 2017 18:39:11 +0000 (11:39 -0700)]
Add method that checks the Binder status of ImsConfig
Adds a method to check whether or not the ImsConfig
binder has died.
Bug:
62723694
Test: maual, follow bug procedure
Change-Id: I9df6533e7e7dc69487cea50fada6c89599b031a3
Evan Laird [Thu, 22 Jun 2017 18:01:31 +0000 (14:01 -0400)]
Better merge fix for empty state signal drawable
The cutout for drawing STATE_EMPTY picked up a fudge factor in the merge
due to the rounded edges changing the size of the triangle. This change
parameterizes the drawing of the cutout based on the placement of the
rounded edges.
Test: visual
Bug:
62905681
Change-Id: Iba2bc0aa240f6bdfb285c2c6535b656bcacbd579
Jason Monk [Thu, 22 Jun 2017 17:45:11 +0000 (13:45 -0400)]
Make default status bar padding 8dp
So all the things can be the sames.
Test: visual
Change-Id: I14edd57e09b57ab8c7c06010346b99fada07e46b
Fixes:
38179995
Android Build Merger (Role) [Thu, 22 Jun 2017 17:40:42 +0000 (17:40 +0000)]
Merge "Merge "Ensure icon contrast on the shelf" into oc-dev am:
d0550a9b6c" into oc-dr1-dev
Lucas Dupin [Thu, 22 Jun 2017 17:39:24 +0000 (17:39 +0000)]
Merge "Ensure icon contrast on the shelf" into oc-dev
am:
d0550a9b6c
Change-Id: Ic82b4d1316d5232712a0e395b080262c314ecf68
Android Build Merger (Role) [Thu, 22 Jun 2017 17:38:53 +0000 (17:38 +0000)]
Merge "Merge "Fix ConcurrentModificationException from LocationController" into oc-dev am:
6791bee744" into oc-dr1-dev
Jason Monk [Thu, 22 Jun 2017 17:37:55 +0000 (17:37 +0000)]
Merge "Fix ConcurrentModificationException from LocationController" into oc-dev
am:
6791bee744
Change-Id: I2bd4481438c382c718d51c65fe3941e88c63b2c7
Android Build Merger (Role) [Thu, 22 Jun 2017 17:37:22 +0000 (17:37 +0000)]
Merge "Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am:
be7657b038" into oc-dr1-dev
Erik Kline [Thu, 22 Jun 2017 17:36:12 +0000 (17:36 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev
am:
be7657b038
Change-Id: Ie34a3c7aa39c9b70602236f4d4a4d5548566dd51
Android Build Merger (Role) [Thu, 22 Jun 2017 17:35:25 +0000 (17:35 +0000)]
Merge "Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev am:
31cf02742e" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 17:34:09 +0000 (17:34 +0000)]
Merge "Add config to artificially inflate number of bars" into oc-dr1-dev
Narayan Kamath [Thu, 22 Jun 2017 17:34:12 +0000 (17:34 +0000)]
Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev
am:
31cf02742e
Change-Id: Ie0d68df7a51c10bc82974680bdd16f1eab48e9fa
TreeHugger Robot [Thu, 22 Jun 2017 17:28:26 +0000 (17:28 +0000)]
Merge "resolve merge conflicts of
c8b180116d42 to oc-dr1-dev" into oc-dr1-dev
Wale Ogunwale [Thu, 22 Jun 2017 16:08:14 +0000 (09:08 -0700)]
Added more systrace points to window manager
To help debug performance issues
Test: external/chromium-trace/systrace.py -t 3
Bug:
62796190
Change-Id: Ie6012a895174053c4732fb58b9365546fdb979de
TreeHugger Robot [Thu, 22 Jun 2017 17:25:10 +0000 (17:25 +0000)]
Merge "Ensure icon contrast on the shelf" into oc-dev
Jason Monk [Tue, 6 Jun 2017 22:01:31 +0000 (18:01 -0400)]
Add API to allow apps more control over instantiation
Let them control construction of standard manifest elements (like
activities) through Application. This will allow for things like
dependency injection and class loader magic.
Test: manual
Bug:
62534409
Change-Id: I5fc2a7ec52bb0e232966704d16f94a192d033267
Merged-In: Iaa2215b225c3b97f4e9ac809dfe499f98c7ad5f1
TreeHugger Robot [Thu, 22 Jun 2017 16:54:36 +0000 (16:54 +0000)]
Merge "Darker extracted gradients." into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 16:25:48 +0000 (16:25 +0000)]
Merge "Use id directly when extensions change fragments" into oc-dr1-dev
Jason Monk [Thu, 22 Jun 2017 15:41:08 +0000 (11:41 -0400)]
Add test for StatusBar.dump
and make it pass
Test: runtest systemui
Change-Id: I26cd913d8df468635b091d5fb3531c975e0ca848
Fixes:
62573356
TreeHugger Robot [Thu, 22 Jun 2017 15:39:22 +0000 (15:39 +0000)]
Merge "Fix ConcurrentModificationException from LocationController" into oc-dev
Jason Monk [Thu, 22 Jun 2017 15:20:04 +0000 (11:20 -0400)]
Add config to artificially inflate number of bars
Test: manual
Bug:
62664881
Change-Id: Id8797f4f6178af16051147d3021bb34074afbca9
Erik Kline [Thu, 22 Jun 2017 15:10:12 +0000 (00:10 +0900)]
resolve merge conflicts of
c8b180116d42 to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Bug:
32163131
Bug:
62343300
Change-Id: I7f86e5f02c8b599aa71babbbb32bf4803cbd9a2f
Merged-In: I542e013aa19fefd3443588c9a81ee59cd669ab6f
Merged-In: I973bdc5b540cce66a9713cebfd5071ad4a4b0a08
Merged-In: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3
Jason Monk [Thu, 22 Jun 2017 15:05:58 +0000 (11:05 -0400)]
Bring back transparency for QS
It was accidentally removed
Test: visual
Change-Id: I569f582d2f81fb3ac8175249857bee507972b9fe
Fixes:
62580741
Jason Monk [Thu, 22 Jun 2017 14:09:29 +0000 (10:09 -0400)]
Use id directly when extensions change fragments
This avoids a crash if the fragment hasn't been created yet.
Test: manual
Change-Id: I0799c50a3482c3c60fd0e27d486db5214e92f183
Fixes:
37855553
Juan Lang [Thu, 22 Jun 2017 14:05:53 +0000 (14:05 +0000)]
Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib." into oc-dr1-dev
Erik Kline [Thu, 22 Jun 2017 13:54:27 +0000 (13:54 +0000)]
Merge "Refactor TISM add/remove code" into oc-dev
am:
c0af382a25 -s ours
Change-Id: I3b5e596034d8f5078dac107d754aec0f77d9ba89
Felipe Leme [Thu, 22 Jun 2017 13:51:25 +0000 (13:51 +0000)]
Merge "Autofill fixes for secondary users:" into oc-dev
am:
6358cdcd28
Change-Id: Ic42bd782988bec610281b651346a5809e912c823
Amith Yamasani [Thu, 22 Jun 2017 13:48:51 +0000 (13:48 +0000)]
Merge "Clarify startScan API on how to get results" into oc-dev
am:
78f3a0f722
Change-Id: Ibc04014f224ecbc666c8296a2b25d939fbfc9921
Pavel Grafov [Thu, 22 Jun 2017 13:45:52 +0000 (13:45 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev
am:
f044e0b87f
Change-Id: I404ec7b0fa7fecb0e4945beca32c634358e0b33e
Rob Carr [Thu, 22 Jun 2017 13:42:47 +0000 (13:42 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev
am:
8bc0aa2559
Change-Id: I45a7ed913929eeb8d1b6eda6855fe7976fa64a14
Bill Yi [Thu, 22 Jun 2017 13:39:36 +0000 (13:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7c23c990f1 -s ours
Change-Id: Ib192e1569074bcd19d38d8e67a8378f63ca99164