OSDN Git Service
Dianne Hackborn [Wed, 5 Apr 2017 22:01:02 +0000 (22:01 +0000)]
Merge "Deliver start service args with ParcelledListSlice." into oc-dev am:
1cf2c97459
am:
ec5feb873e
Change-Id: I7c9e933e06108de5ddf66585ef753055fd0300ac
TreeHugger Robot [Wed, 5 Apr 2017 21:58:00 +0000 (21:58 +0000)]
Merge "Stop scan on device chooser activity backgrounded"
Adrian Roos [Wed, 5 Apr 2017 20:52:21 +0000 (13:52 -0700)]
resolve merge conflicts of
3a1776794a54 to master
Test: runtest systemui
Change-Id: I711fe627beb95c6e8a089a2118a842f951754abe
Dianne Hackborn [Wed, 5 Apr 2017 20:46:48 +0000 (20:46 +0000)]
Merge "Deliver start service args with ParcelledListSlice." into oc-dev
am:
1cf2c97459
Change-Id: Iacdd90c6081e93e38cfe932f5210545f33562f7a
Dianne Hackborn [Wed, 5 Apr 2017 20:37:31 +0000 (20:37 +0000)]
Merge "Deliver start service args with ParcelledListSlice." into oc-dev
Adrian Roos [Wed, 5 Apr 2017 20:36:49 +0000 (20:36 +0000)]
Merge changes Ibdf9cf90,I3a6dd476,Id4008fc7,Iede88d1e into oc-dev
am:
debabde073
Change-Id: I9550d91619d544d80dae1de51412527733a18e80
Felipe Leme [Wed, 5 Apr 2017 20:36:44 +0000 (20:36 +0000)]
Merge "Removed deprecated auto(F)ill classes." into oc-dev am:
b44feb154b
am:
dae23dab8c
Change-Id: I9285ea27ae36d06d1466ec74322a38609acfaab4
Felipe Leme [Wed, 5 Apr 2017 20:32:10 +0000 (20:32 +0000)]
Merge "Removed deprecated auto(F)ill classes." into oc-dev
am:
b44feb154b
Change-Id: I95768d5e62af9f9fd6469b8a8e36c6e6a196091a
Dmitry Dementyev [Wed, 5 Apr 2017 20:31:06 +0000 (20:31 +0000)]
Merge "Clear calling identity before getUserAccounts in AccountManagerService" into oc-dev am:
8c9f966eab
am:
7e9c81f3ad
Change-Id: I72c6c4429075a78f3c0ed76dac380ebd1270be02
TreeHugger Robot [Wed, 5 Apr 2017 20:30:15 +0000 (20:30 +0000)]
Merge changes Ibdf9cf90,I3a6dd476,Id4008fc7,Iede88d1e into oc-dev
* changes:
NotificationViewWrapper: Fix crash for custom views
Revert "Revert "AOD: Use color filter to invert icons for AOD""
Revert "Revert "NotificationWrappers: Factor out doze treatment""
AOD: prevent clicking shelf when dark
Eugene Susla [Tue, 28 Mar 2017 22:40:44 +0000 (15:40 -0700)]
Stop scan on device chooser activity backgrounded
This effectively treats chooser activity pause event as cancel.
Bug:
30932767
Test: Install two toy apps and call associate API from both.
Ensure foreground app always end up showing fresh data.
Change-Id: I49943959c2b4f05f2e1d49603fd472b3e0c47213
Dmitry Dementyev [Wed, 5 Apr 2017 20:26:05 +0000 (20:26 +0000)]
Merge "Clear calling identity before getUserAccounts in AccountManagerService" into oc-dev
am:
8c9f966eab
Change-Id: I96d92e870a377ac0c5b6a08d4f1affc01fa07396
TreeHugger Robot [Wed, 5 Apr 2017 20:25:36 +0000 (20:25 +0000)]
Merge "Removed deprecated auto(F)ill classes." into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 20:18:38 +0000 (20:18 +0000)]
Merge "Clear calling identity before getUserAccounts in AccountManagerService" into oc-dev
Rubin Xu [Wed, 5 Apr 2017 20:12:47 +0000 (20:12 +0000)]
Merge "Tweak javadoc of setResetPasswordToken" into oc-dev am:
ae23290ef5
am:
b9b4825c8b
Change-Id: I5afb297b9a4718ac26ae2051dd6bb75338794d06
Daniel Nishi [Wed, 5 Apr 2017 20:11:08 +0000 (20:11 +0000)]
Merge "Add storage fullness methods to volume provider." into oc-dev am:
4566fd3abc
am:
20ea785a18
Change-Id: Ibbfea8abbf8bc2bd7c545bb1adec3ddd919bffa6
Rubin Xu [Wed, 5 Apr 2017 20:07:18 +0000 (20:07 +0000)]
Merge "Tweak javadoc of setResetPasswordToken" into oc-dev
am:
ae23290ef5
Change-Id: Ib8988c2c0c07aba71fe995a64c7bb7d8fe504141
Daniel Nishi [Wed, 5 Apr 2017 20:05:45 +0000 (20:05 +0000)]
Merge "Add storage fullness methods to volume provider." into oc-dev
am:
4566fd3abc
Change-Id: I8183ebd7dedf01767b046863e6e7ba1e550a9b08
Kang Li [Wed, 5 Apr 2017 20:02:37 +0000 (20:02 +0000)]
Merge "Revert "Add a service to rank apps for ResolverActivity."" into oc-dev am:
b24399547c
am:
e9b280bbec
Change-Id: I84ac856c1838184e2ce819e5f637f2f97cdacbf6
TreeHugger Robot [Wed, 5 Apr 2017 20:01:59 +0000 (20:01 +0000)]
Merge "Tweak javadoc of setResetPasswordToken" into oc-dev
Daniel Nishi [Wed, 5 Apr 2017 19:59:12 +0000 (19:59 +0000)]
Merge "Add storage fullness methods to volume provider." into oc-dev
Kang Li [Wed, 5 Apr 2017 19:57:08 +0000 (19:57 +0000)]
Merge "Revert "Add a service to rank apps for ResolverActivity."" into oc-dev
am:
b24399547c
Change-Id: I45e96d0b5e88eb280e6dbc5981e6a6a7f1a4b6e2
Kang Li [Wed, 5 Apr 2017 19:50:06 +0000 (19:50 +0000)]
Merge "Revert "Add a service to rank apps for ResolverActivity."" into oc-dev
Hall Liu [Wed, 5 Apr 2017 19:49:03 +0000 (19:49 +0000)]
Merge "Query geo description in worker thread to prevent ANR" am:
eb7c287c71 am:
53d241411a am:
b0e36dec89
am:
5d810f47da
Change-Id: Ib7ee22cee691b0fa7d6a247c564a3f640d5cbe33
Kang Li [Wed, 5 Apr 2017 16:13:12 +0000 (16:13 +0000)]
Revert "Add a service to rank apps for ResolverActivity."
This reverts commit
90370e0b2497deba9382ab7ff1539b6849df8139.
b:
36952725
Change-Id: Ifa8f182c707cdbbc989b1f61630f7a8fa856d32d
Hall Liu [Wed, 5 Apr 2017 19:43:39 +0000 (19:43 +0000)]
Merge "Query geo description in worker thread to prevent ANR" am:
eb7c287c71 am:
53d241411a
am:
b0e36dec89
Change-Id: Idf51f20246e2bd91dcc0b65ec2102b788d9e10fe
Todd Kennedy [Wed, 5 Apr 2017 19:43:31 +0000 (19:43 +0000)]
Merge "look for old intent values" into oc-dev am:
1aade4e4a1
am:
057e80d21c
Change-Id: I5d4cfc4ccc8567f39bb0691868e3310a718c8d04
Hall Liu [Wed, 5 Apr 2017 19:38:07 +0000 (19:38 +0000)]
Merge "Query geo description in worker thread to prevent ANR" am:
eb7c287c71
am:
53d241411a
Change-Id: If224f142cf1bb77ecf8ed515250ad5c813682eb0
Todd Kennedy [Wed, 5 Apr 2017 19:38:04 +0000 (19:38 +0000)]
Merge "look for old intent values" into oc-dev
am:
1aade4e4a1
Change-Id: I3c5d202886862de4b631e23fffb357613998ac6b
Todd Kennedy [Wed, 5 Apr 2017 19:32:23 +0000 (19:32 +0000)]
Merge "look for old intent values" into oc-dev
Hall Liu [Wed, 5 Apr 2017 19:32:07 +0000 (19:32 +0000)]
Merge "Query geo description in worker thread to prevent ANR"
am:
eb7c287c71
Change-Id: I0df6d788ff5f8794e03324c3dacf337a7a04c36c
Hall Liu [Wed, 5 Apr 2017 19:23:29 +0000 (19:23 +0000)]
Merge "Query geo description in worker thread to prevent ANR"
Tyler Gunn [Wed, 5 Apr 2017 18:44:37 +0000 (18:44 +0000)]
Merge "Add api to retrieve call creation time." into oc-dev am:
c85aa306c1
am:
a268c370dc
Change-Id: If043ac4eb502b0262395ab4fb0f933a21fd994e6
Tyler Gunn [Wed, 5 Apr 2017 18:36:44 +0000 (18:36 +0000)]
Merge "Add api to retrieve call creation time." into oc-dev
am:
c85aa306c1
Change-Id: Ie3601acb589852a850d41336cad0ffe52f88ca4d
TreeHugger Robot [Wed, 5 Apr 2017 18:29:17 +0000 (18:29 +0000)]
Merge "Add api to retrieve call creation time." into oc-dev
Adrian Roos [Wed, 5 Apr 2017 00:22:03 +0000 (17:22 -0700)]
NotificationViewWrapper: Fix crash for custom views
Bug:
36430936
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationViewWrapperTest.java
Change-Id: Ibdf9cf90fcb69a8af8a3b60596143e3be83fe46e
Merged-In: Ibdf9cf90fcb69a8af8a3b60596143e3be83fe46e
Dmitry Dementyev [Tue, 4 Apr 2017 18:12:42 +0000 (11:12 -0700)]
Clear calling identity before getUserAccounts in
AccountManagerService
Fix accountsDb tests.
Bug:
36860606
Test: manual
Change-Id: Iad86d1bf7edd0f847262562ace9c2d5c9fdff978
(cherry picked from commit
9fc6f574b43c938913fad7a2ed04b5a7c717bd68)
Adrian Roos [Tue, 4 Apr 2017 23:44:29 +0000 (16:44 -0700)]
Revert "Revert "AOD: Use color filter to invert icons for AOD""
This reverts commit
30d9bad7673eaa518cc43444259f71af9b34e5ec.
Change-Id: I3a6dd476cb90074d012a05bb291eeaf441fe20d3
Merged-In: I3a6dd476cb90074d012a05bb291eeaf441fe20d3
Dmitry Dementyev [Wed, 5 Apr 2017 18:24:03 +0000 (18:24 +0000)]
Merge "Clear calling identity before getUserAccounts in AccountManagerService"
Adrian Roos [Tue, 4 Apr 2017 23:44:25 +0000 (16:44 -0700)]
Revert "Revert "NotificationWrappers: Factor out doze treatment""
This reverts commit
934027a4307d5bc4896d662fd92c47c556e11cca.
Change-Id: Id4008fc79e474f3820f3587dff40720a57c9ef3a
Merged-In: Id4008fc79e474f3820f3587dff40720a57c9ef3a
Adrian Roos [Wed, 29 Mar 2017 00:54:05 +0000 (17:54 -0700)]
AOD: prevent clicking shelf when dark
Fixes:
35718464
Test: Enable AOD, try clicking on shelf in AOD, make sure it's not clickable.
Change-Id: Iede88d1e0ab394f0db2acaac6a1ad8baaeef15f1
Rubin Xu [Wed, 5 Apr 2017 17:37:07 +0000 (18:37 +0100)]
Tweak javadoc of setResetPasswordToken
Bug:
34600579
Test: make -j32 docs
Change-Id: Ib4593c20fb78f52d5e75cafdfea32d747cc340c9
Bryce Lee [Wed, 5 Apr 2017 18:13:59 +0000 (18:13 +0000)]
Merge "Do not try to restore a task id if it does not exist." into oc-dev am:
081d2ccd52
am:
2885540579
Change-Id: Id3879ed5888de37b22f2ce1589ede83414844aa8
Bryce Lee [Wed, 5 Apr 2017 18:12:57 +0000 (18:12 +0000)]
Merge "Fix ActivityRecordTests." into oc-dev am:
8592407581
am:
772a7a51d2
Change-Id: Icb00c818e9c94c68ac7f813ea4aac7cd4be70429
Bryce Lee [Wed, 5 Apr 2017 18:08:33 +0000 (18:08 +0000)]
Merge "Do not try to restore a task id if it does not exist." into oc-dev
am:
081d2ccd52
Change-Id: I2e5109329275a12ef7ce5aa550de8ef8f56ad807
Bryce Lee [Wed, 5 Apr 2017 18:07:24 +0000 (18:07 +0000)]
Merge "Fix ActivityRecordTests." into oc-dev
am:
8592407581
Change-Id: I25798368a966852c882db3e3c9362c9e17405211
Bryce Lee [Wed, 5 Apr 2017 18:01:52 +0000 (18:01 +0000)]
Merge "Do not try to restore a task id if it does not exist." into oc-dev
Bryce Lee [Wed, 5 Apr 2017 18:00:28 +0000 (18:00 +0000)]
Merge "Fix ActivityRecordTests." into oc-dev
Adrian Roos [Wed, 5 Apr 2017 17:58:28 +0000 (17:58 +0000)]
Merge changes I70f79400,I2f8cab37 into oc-dev am:
bb790ca951
am:
b298e4f87c
Change-Id: Id26bc89dfc8ac5575293d4f9e8c241a66742c3a2
fionaxu [Wed, 5 Apr 2017 17:57:27 +0000 (17:57 +0000)]
Merge "support notification channel for defaultcarrier app" into oc-dev am:
ff16d749dd
am:
8bc68d70fe
Change-Id: I1dc865bcf59707d3264e5c08614a6c48f4d5ea05
Adrian Roos [Wed, 5 Apr 2017 17:53:28 +0000 (17:53 +0000)]
Merge changes I70f79400,I2f8cab37 into oc-dev
am:
bb790ca951
Change-Id: Ie5286397f0b0e28732e142d6cd31ccfd9d1c19a7
fionaxu [Wed, 5 Apr 2017 17:52:23 +0000 (17:52 +0000)]
Merge "support notification channel for defaultcarrier app" into oc-dev
am:
ff16d749dd
Change-Id: I6288ecddda6a9a6c64badbcf8958ecbfe6aa77e5
Adrian Roos [Wed, 5 Apr 2017 17:47:29 +0000 (17:47 +0000)]
Merge changes I70f79400,I2f8cab37 into oc-dev
* changes:
AOD: Adjust header to spec
AOD: Only show actually pulsing entries
Android Build Merger (Role) [Wed, 5 Apr 2017 17:47:11 +0000 (17:47 +0000)]
Merge "Merge "Add AppWidgetManager#getInstalledProvidersForPackage()" into oc-dev am:
8fdf051346 am:
dfa3edb2ee"
TreeHugger Robot [Wed, 5 Apr 2017 17:46:47 +0000 (17:46 +0000)]
Merge "Canonicalize tz IDs when finding exemplar location"
Tony Wickham [Wed, 5 Apr 2017 17:46:25 +0000 (17:46 +0000)]
Merge "Add AppWidgetManager#getInstalledProvidersForPackage()" into oc-dev am:
8fdf051346
am:
dfa3edb2ee
Change-Id: Id9657f3a43e68692382009da8764d700587517e8
TreeHugger Robot [Wed, 5 Apr 2017 17:46:18 +0000 (17:46 +0000)]
Merge "support notification channel for defaultcarrier app" into oc-dev
Tony Wickham [Wed, 5 Apr 2017 17:41:29 +0000 (17:41 +0000)]
Merge "Add AppWidgetManager#getInstalledProvidersForPackage()" into oc-dev
am:
8fdf051346
Change-Id: Ieda874c08955647005b9545fa7587e123339247b
Tony Wickham [Wed, 5 Apr 2017 17:37:11 +0000 (17:37 +0000)]
Merge "Add AppWidgetManager#getInstalledProvidersForPackage()" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 16:30:32 +0000 (16:30 +0000)]
Merge "Consolidate a11y unit tests and get them working"
TreeHugger Robot [Wed, 5 Apr 2017 16:17:15 +0000 (16:17 +0000)]
Merge "SystemServer: fix StartIpSecService trace and log"
Jason Monk [Wed, 5 Apr 2017 16:07:51 +0000 (16:07 +0000)]
Merge "Fix monkey crash" into oc-dev am:
c01dd791c3
am:
8da1dc27f9
Change-Id: Ia6d971f51e6fa294392b7283014642c45f17136a
Jason Monk [Wed, 5 Apr 2017 16:02:56 +0000 (16:02 +0000)]
Merge "Fix monkey crash" into oc-dev
am:
c01dd791c3
Change-Id: I67f19cb80671166826e97e3e2470037b426500c4
TreeHugger Robot [Wed, 5 Apr 2017 15:55:37 +0000 (15:55 +0000)]
Merge "Fix monkey crash" into oc-dev
Tyler Gunn [Fri, 17 Mar 2017 18:27:09 +0000 (11:27 -0700)]
Add api to retrieve call creation time.
Test: CTS
Bug:
36124432
Merged-In: Ic8288dec73adda7870377f189f560acef0a575f6
Change-Id: Ic8288dec73adda7870377f189f560acef0a575f6
Bryce Lee [Wed, 5 Apr 2017 15:39:40 +0000 (08:39 -0700)]
Fix ActivityRecordTests.
Tests are not guaranteed to run on the same thread as setup methods.
Therefore, we must ensure any loopers used are already created by the
time the test runs. We do this now by creating a HandlerThread and
referencing its Looper later. Loopers are initialized per
HandlerThread, which will allow us to both isolate its usage and
guarantee the Looper initialization by test time.
Change-Id: If15494783959e5c399375033253cef69b921ff84
Fixes:
36916522
Test: bit FrameworksServicesTests:com.android.server.am.ActivityRecordTests
TreeHugger Robot [Wed, 5 Apr 2017 15:38:30 +0000 (15:38 +0000)]
Merge "switch over to SkVertices object, and stop using deprecated methods."
Android Build Merger (Role) [Wed, 5 Apr 2017 15:34:12 +0000 (15:34 +0000)]
Merge "Merge "Make sure to remove child views when recreating notification menu row" into oc-dev am:
1e943b3ef0 am:
4ba5995a87"
Mady Mellor [Wed, 5 Apr 2017 15:33:39 +0000 (15:33 +0000)]
Merge "Make sure to remove child views when recreating notification menu row" into oc-dev am:
1e943b3ef0
am:
4ba5995a87
Change-Id: I80acb0ae322d9bfd5f3e2d52a569f080822b3a01
TreeHugger Robot [Wed, 5 Apr 2017 15:33:23 +0000 (15:33 +0000)]
Merge "Introduce BackupManagerServiceInteface in remaining parts of the code."
Geoffrey Pitsch [Wed, 5 Apr 2017 15:32:43 +0000 (15:32 +0000)]
Merge "Inline Controls hide Settings button when no appropriate link." into oc-dev am:
18cbccbfb0
am:
6375068908
Change-Id: I9b90d07b011c019da8b24f17ded6d53742c17a53
Wale Ogunwale [Wed, 5 Apr 2017 15:31:46 +0000 (15:31 +0000)]
Merge "Corrected alert window text based on UX feedback." into oc-dev am:
2075b09c62
am:
8a65fcb09b
Change-Id: Iecdfc67a966f832caf7c90d615dce6657e12069c
Mady Mellor [Wed, 5 Apr 2017 15:26:15 +0000 (15:26 +0000)]
Merge "Make sure to remove child views when recreating notification menu row" into oc-dev
am:
1e943b3ef0
Change-Id: I6aa4903673eaf099a77eaf90d95abfacca550ea3
Geoffrey Pitsch [Wed, 5 Apr 2017 15:25:16 +0000 (15:25 +0000)]
Merge "Inline Controls hide Settings button when no appropriate link." into oc-dev
am:
18cbccbfb0
Change-Id: Ic0aff571bdb29570e2e5b56a5ce76c75d27f69e3
Wale Ogunwale [Wed, 5 Apr 2017 15:24:14 +0000 (15:24 +0000)]
Merge "Corrected alert window text based on UX feedback." into oc-dev
am:
2075b09c62
Change-Id: I4cf2e5d489cb35c16f87b4dc68665c7a73c10ddf
TreeHugger Robot [Wed, 5 Apr 2017 15:20:45 +0000 (15:20 +0000)]
Merge "Make sure to remove child views when recreating notification menu row" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 15:18:34 +0000 (15:18 +0000)]
Merge "Inline Controls hide Settings button when no appropriate link." into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 15:18:07 +0000 (15:18 +0000)]
Merge "Corrected alert window text based on UX feedback." into oc-dev
Todd Kennedy [Wed, 5 Apr 2017 14:44:19 +0000 (07:44 -0700)]
look for old intent values
the instant app installer/resolver/setting components haven't updated
to the new values yet. Need to continue looking for the previous intent
values.
Test: boot and see ephemeral enabled
Change-Id: Id88191a4878a138fa90bbd9816805ff76665ada9
Mike Reed [Tue, 4 Apr 2017 19:32:04 +0000 (15:32 -0400)]
switch over to SkVertices object, and stop using deprecated methods.
This allows Skia to remove
SK_SUPPORT_LEGACY_CANVAS_VERTICES
SK_SUPPORT_LEGACY_BITMAP_SETPIXELREF
SK_SUPPORT_LEGACY_PIXELREFFACTORY
Test: Existing CTS cover these changes
Running CtsGraphicsTestCases, there were 6 failures w/ and w/o this CL.
None of the 6 seems related to this CL.
Change-Id: I724082357d9f6cb699770df3c0b9ef555b957697
Alan Viverette [Wed, 5 Apr 2017 14:05:08 +0000 (14:05 +0000)]
Merge "Automatic casts for more findViewById implementations" into oc-dev am:
7458ea3827
am:
ee4b52afd8
Change-Id: Ie5ebcf1156e31da0b76d8f053a3c23f91e8ea7b9
Alan Viverette [Wed, 5 Apr 2017 13:58:51 +0000 (13:58 +0000)]
Merge "Automatic casts for more findViewById implementations" into oc-dev
am:
7458ea3827
Change-Id: I7c77634f1a5b2551830796118e1fe69d389d6884
Alan Viverette [Wed, 5 Apr 2017 13:54:47 +0000 (13:54 +0000)]
Merge "Automatic casts for more findViewById implementations" into oc-dev
Artem Iglikov [Wed, 5 Apr 2017 12:43:10 +0000 (13:43 +0100)]
Introduce BackupManagerServiceInteface in remaining parts of the code.
Use it in Trampoline, KeyValueAdbBackupEngine, KeyValueAdbRestoreEngine
where it wasn't used automatically, because of using package-private
methods and fields. To be able to do this, also make couple of methods
public and move them to the interface and add getBackupManagerBinder()
method to use instead of directly accessing the field.
Test: not required as behaviour is not modified.
Bug:
36850431
Change-Id: Ia7a26f93f8dba37ece87305979c922acb58a271f
Wale Ogunwale [Wed, 5 Apr 2017 13:08:53 +0000 (06:08 -0700)]
Corrected alert window text based on UX feedback.
Fixes:
36813743
Test: Text change only.
Change-Id: I7431ca568474f8fed242a94d68e7a5ea6b289b8c
Neil Fuller [Wed, 5 Apr 2017 12:58:26 +0000 (13:58 +0100)]
Canonicalize tz IDs when finding exemplar location
Canonicalize time zone IDs when looking up exemplar location.
ICU's canonical IDs are not guaranteed the same as IANA's.
Various data files (e.g. timezones.xml, tzdata,
time_zones_by_country.xml) are using IANA IDs. ICU's IDs
are often the same, but because they are guaranteed not to
change and IANAs are not there is some drift.
This fixes an issue with the settings picker for ICU IDs:
America/Buenos_Aires
Asia/Rangoon
Asia/Katmandu
Asia/Calcutta
Which are IANA's:
America/Argentina/Buenos_Aires
Asia/Yangon
Asia/Kathmandu
Asia/Kolkata
introduced by commit
b4d003da66.
It could also influence some display names for
automatically-selected time zones outside of this list.
The issues was particularly noticeable in locales that
use non-ASCII scripts; ICU performs a fallback if the ID
isn't canonical and would transform and return the last
part of the ID (e.g. Buenos Aires, Yangon, Kathmandu,
Kolkata).
Bug:
36469833
Test: Manual testing in Japanese
Change-Id: I2febdbee58e474d251d0a33f2c8335664a74581f
Artem Iglikov [Wed, 5 Apr 2017 12:17:51 +0000 (12:17 +0000)]
Merge "Rename IBackupManagerService to BackupManagerServiceInterface."
Alejandro Fernández [Wed, 5 Apr 2017 11:36:30 +0000 (11:36 +0000)]
Merge "Updating javadoc string for DevicePolicyManager.EXTRA_PROVISIONING_SUPPORT_URL to indicate that only HTTPS urls are supported." into oc-dev am:
8d41ad08c0
am:
91266901dc
Change-Id: I22b145e575d20e367fcab7d0d6b8aaa0d142d732
Alejandro Fernández [Wed, 5 Apr 2017 11:31:29 +0000 (11:31 +0000)]
Merge "Updating javadoc string for DevicePolicyManager.EXTRA_PROVISIONING_SUPPORT_URL to indicate that only HTTPS urls are supported." into oc-dev
am:
8d41ad08c0
Change-Id: I2a0f80a5da207243aa39c6d19e0743261f655f62
TreeHugger Robot [Wed, 5 Apr 2017 11:25:26 +0000 (11:25 +0000)]
Merge "Updating javadoc string for DevicePolicyManager.EXTRA_PROVISIONING_SUPPORT_URL to indicate that only HTTPS urls are supported." into oc-dev
Neil Fuller [Wed, 5 Apr 2017 10:44:31 +0000 (10:44 +0000)]
Merge "Update to latest tzdata / switch back to zones.tab" into oc-dev am:
0a49354820
am:
167cee4226
Change-Id: I084031b61037afa442a8e22ed1d8c52aee6c9a21
Neil Fuller [Wed, 5 Apr 2017 10:39:28 +0000 (10:39 +0000)]
Merge "Update to latest tzdata / switch back to zones.tab" into oc-dev
am:
0a49354820
Change-Id: I2d5a0d65ecb2da43f4da92cb56f7f416a855ef3a
Neil Fuller [Wed, 5 Apr 2017 10:33:45 +0000 (10:33 +0000)]
Merge "Update to latest tzdata / switch back to zones.tab" into oc-dev
Seigo Nonaka [Wed, 5 Apr 2017 10:19:10 +0000 (10:19 +0000)]
Merge "Pass weight/italic pair instead of style." into oc-dev am:
b4e3b344fa
am:
97b35a7089
Change-Id: Id75281df282cf6f0b77def2c7cffcc88ef92c417
Seigo Nonaka [Wed, 5 Apr 2017 10:12:26 +0000 (10:12 +0000)]
Merge "Pass weight/italic pair instead of style." into oc-dev
am:
b4e3b344fa
Change-Id: I9d430af9489878fd0c7eb8d26dce186a13059450
TreeHugger Robot [Wed, 5 Apr 2017 10:04:45 +0000 (10:04 +0000)]
Merge "Pass weight/italic pair instead of style." into oc-dev
Wei Wang [Wed, 5 Apr 2017 05:00:01 +0000 (22:00 -0700)]
SystemServer: fix StartIpSecService trace and log
Bug:
36920223
Test: boot and see log
Change-Id: I9b88564ac7eef6998af465b977fa66c7d0787cf2
Felipe Leme [Wed, 5 Apr 2017 04:38:37 +0000 (04:38 +0000)]
Merge "Temporarily hardcoded dimensions of autofill authentication UI." into oc-dev am:
24bac61498
am:
505729c509
Change-Id: Iba5d5ca47e649bb08f2573872f1e5770f2159a74
Felipe Leme [Wed, 5 Apr 2017 04:34:36 +0000 (04:34 +0000)]
Merge "Temporarily hardcoded dimensions of autofill authentication UI." into oc-dev
am:
24bac61498
Change-Id: Ifb07238314f220ee97f1677e2005ac00a613c1e2
Felipe Leme [Wed, 5 Apr 2017 04:29:20 +0000 (04:29 +0000)]
Merge "Temporarily hardcoded dimensions of autofill authentication UI." into oc-dev
OSDN Git Service
