OSDN Git Service
Andrii Kulian [Mon, 7 Aug 2017 22:21:08 +0000 (22:21 +0000)]
Merge "Add black frame behind app window" into oc-dr1-dev
am:
cbdaf04101
Change-Id: I9ce5cf5aea7f0fd93fbe24664bbd583d5057d3e6
TreeHugger Robot [Mon, 7 Aug 2017 22:18:11 +0000 (22:18 +0000)]
Merge "AAPT2: Add targetConfig to AndroidManifest.xml" into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 22:17:50 +0000 (22:17 +0000)]
Merge "AAPT2: Ensure style strings are always first in StringPool" into oc-mr1-dev
Andrii Kulian [Mon, 7 Aug 2017 22:07:22 +0000 (22:07 +0000)]
Merge "Add black frame behind app window" into oc-dr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 21:20:54 +0000 (21:20 +0000)]
Merge "media: Address api council comments." into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 21:10:49 +0000 (21:10 +0000)]
Merge "Only replace new line characters if the wakelock name contains one The original operation creates new string everytime which is expensive" into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 21:05:42 +0000 (21:05 +0000)]
Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev
Peter Qiu [Mon, 7 Aug 2017 20:12:05 +0000 (20:12 +0000)]
Merge "Revert "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT"" into oc-mr1-dev
Peter Qiu [Mon, 7 Aug 2017 20:06:20 +0000 (20:06 +0000)]
Revert "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT"
This reverts commit
84933321668c79202de39ea491329f7234ce6ee5.
Change-Id: Ibecf24689952d4888269863ff02d8c97e14a0c31
Adrian Roos [Mon, 7 Aug 2017 18:41:04 +0000 (18:41 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev
am:
2b7fbd010e
Change-Id: I2956ecaff7b471af05e9baa275d7ea0742bfb4eb
TreeHugger Robot [Mon, 7 Aug 2017 18:27:57 +0000 (18:27 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 18:19:59 +0000 (18:19 +0000)]
Merge "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev
Adam Lesinski [Mon, 7 Aug 2017 17:43:08 +0000 (17:43 +0000)]
Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev
am:
242c22c900
Change-Id: I8be36dcf67b6d32f69fbefdf2bd78e04034f6bb8
TreeHugger Robot [Mon, 7 Aug 2017 17:34:44 +0000 (17:34 +0000)]
Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev
Ecco Park [Mon, 7 Aug 2017 17:18:55 +0000 (17:18 +0000)]
Location: adding NULL check for the LPP_PROFILE property
am:
8eec744ccb
Change-Id: Ia72f80b5d809190c7e2f733c8e59bf989f826973
Ecco Park [Fri, 4 Aug 2017 23:21:59 +0000 (16:21 -0700)]
Location: adding NULL check for the LPP_PROFILE property
Bug:
35485906
Change-Id: I5e40be8ce0d3832f0e913bfe8fd9a38d87d0d28c
Signed-off-by: Ecco Park <eccopark@google.com>
Jonathan Basseri [Mon, 7 Aug 2017 16:24:31 +0000 (16:24 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev
am:
35a563ef62
Change-Id: Ib898af17ce2985a1e19759dd9296f3cea8077018
Jonathan Basseri [Mon, 7 Aug 2017 16:18:52 +0000 (16:18 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 16:18:37 +0000 (16:18 +0000)]
Merge "Allow marking fields with @TargetApi(XX)" into oc-mr1-dev
Adrian Roos [Mon, 7 Aug 2017 13:52:26 +0000 (15:52 +0200)]
AOD: Fix shelf animating when it should not
Fixes an issue where the shelf would animate downwards when going to AOD.
The issue is that setDark gets called in updateIsKeyguard even though nothing changed,
yet it still re-requests the dark transition. Consequently, when the keyguard goes dark
later, the requested transition executes and moves the shelf downwards.
Change-Id: I8c590aeb4f330d8c3c1b51285d899d5f6db36323
Fixes:
64412244
Test: Double tap on notification on AOD2; press power; verify shelf does not move downwards
Adrian Roos [Mon, 7 Aug 2017 13:48:46 +0000 (13:48 +0000)]
Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev
am:
9f3bac52ee
Change-Id: I8c17429ce2b79a3e14e7b6cbabf7b377ace44718
TreeHugger Robot [Mon, 7 Aug 2017 13:41:22 +0000 (13:41 +0000)]
Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev
Adrian Roos [Mon, 7 Aug 2017 13:02:21 +0000 (13:02 +0000)]
Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev
am:
81e3b48f9c
Change-Id: I6f0ae86412eb174474d640c437e0b0b006507c00
TreeHugger Robot [Mon, 7 Aug 2017 12:53:50 +0000 (12:53 +0000)]
Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev
Jorim Jaggi [Mon, 7 Aug 2017 12:34:41 +0000 (12:34 +0000)]
Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev
am:
9aa43e6320
Change-Id: I0889a00cbdc54d401484391d66e0dd06ac92fd71
Jorim Jaggi [Mon, 7 Aug 2017 12:27:53 +0000 (12:27 +0000)]
Merge "Fix light bar flickers" into oc-dr1-dev
am:
997f2f71fa
Change-Id: I8b5fb57655afe1b9cab6afe3f5f34d48413af062
Jorim Jaggi [Mon, 7 Aug 2017 12:23:55 +0000 (12:23 +0000)]
Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev
Jorim Jaggi [Mon, 7 Aug 2017 12:17:35 +0000 (12:17 +0000)]
Merge "Fix light bar flickers" into oc-dr1-dev
Martijn Coenen [Mon, 7 Aug 2017 11:01:14 +0000 (11:01 +0000)]
Merge "screencap: always exit with _exit()." into oc-dr1-dev
am:
4499576db0 -s ours
Change-Id: I6119b3e45a4b104aa9a7cbad576a6b3d8a273ca4
TreeHugger Robot [Mon, 7 Aug 2017 10:54:02 +0000 (10:54 +0000)]
Merge "screencap: always exit with _exit()." into oc-dr1-dev
Robert Carr [Mon, 7 Aug 2017 10:49:05 +0000 (10:49 +0000)]
Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev
am:
17844f2257
Change-Id: Ic1d7779f66958961da22230187f71310d9fedec8
TreeHugger Robot [Mon, 7 Aug 2017 10:44:18 +0000 (10:44 +0000)]
Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 06:01:02 +0000 (06:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Hugo Benichi [Mon, 7 Aug 2017 05:49:25 +0000 (05:49 +0000)]
Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev
am:
1b3877a965
Change-Id: I50748aa0c9332787797f91265afccf82ceabf332
Hugo Benichi [Mon, 7 Aug 2017 05:42:48 +0000 (05:42 +0000)]
Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev
Pankaj Kanwar [Sun, 6 Aug 2017 18:58:41 +0000 (18:58 +0000)]
Merge "Adding strings to support warning about emergency calls." into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 17:26:43 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:36:37 +0000 (16:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:34:54 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:28:58 +0000 (16:28 +0000)]
Merge "Fix broken javadocs." into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:23:59 +0000 (16:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:22:25 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:20:54 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:19:51 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:19:05 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:15:03 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:13:56 +0000 (16:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:05:04 +0000 (16:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 15:57:07 +0000 (15:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 14:52:48 +0000 (14:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Jeff Sharkey [Sat, 5 Aug 2017 19:49:13 +0000 (13:49 -0600)]
Fix broken javadocs.
Bug:
64337634
Test: make -j32 doc-comment-check-docs
Change-Id: I20fdd3dcddef09111d35946c41c596c7689effa6
Bill Yi [Sun, 6 Aug 2017 10:16:09 +0000 (03:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia0c7b2cac613780c802ac645226d33ad031d768a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 10:09:38 +0000 (03:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I10155c355d302c88ef1e99d7dc64da171be90840
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:47:13 +0000 (01:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3e617e1a004e45b485658d496e09cd4c732415cc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:40:32 +0000 (01:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia3d470f1ae6cc63bb3cc9d58b896eaf57075e0a4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:35:38 +0000 (01:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iea4f3f8198348c4ac06675dc9881d13d09528b39
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:30:50 +0000 (01:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I962af978bb234c98434ec32b7cca97bdedb2e7f4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:26:03 +0000 (01:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic952913a31c1683c0a6ea7c14763721c529ce26d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:21:24 +0000 (01:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib2668121a28d316552691d7f72da05a5a3c78321
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:14:54 +0000 (01:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iec1e8c2c5c13484ffc915fcaa874d5cc43c1a66c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:09:59 +0000 (01:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5ed3fe6e64b2ac5bec9e451e9e1797e6bea8031b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:05:08 +0000 (01:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: If79c2f71715afe6a11a91a8e3e94fb9184f3a21f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:00:22 +0000 (01:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iab686e68cda9fac3b18a8fb38fe766d9583ebf68
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 07:54:17 +0000 (00:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie00477d775338c307f23550d2bdc99f0933246e8
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 01:43:53 +0000 (18:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie34e4b0e1787d5772c175be2c0de14a6de527003
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 01:33:48 +0000 (18:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib2fd9bee8040fa4c57a62cbf22a64361201ab7cd
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Chen Xu [Sat, 5 Aug 2017 22:54:29 +0000 (22:54 +0000)]
Merge "rename notification channel" into oc-mr1-dev
Tomasz Wasilczyk [Sat, 5 Aug 2017 20:47:14 +0000 (20:47 +0000)]
Merge "Pass ProgramInfo over currentProgramInfoChanged and drop afSwitch_1_1." into oc-mr1-dev
Bill Yi [Sat, 5 Aug 2017 13:42:53 +0000 (13:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
f6d5426433 -s ours
Change-Id: Ie9c97e96908f2552ec64910eac8dd3d8aff45500
Bill Yi [Sat, 5 Aug 2017 13:40:53 +0000 (13:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
5e4a4d76e1 -s ours
Change-Id: I6b5cbb464105136e6cdaacd6a971232dfb837edd
Bill Yi [Sat, 5 Aug 2017 13:38:52 +0000 (13:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
08815ac99f -s ours
Change-Id: I18be08851853ec4eefd1f209d9452f4412ed6584
Bill Yi [Sat, 5 Aug 2017 13:36:11 +0000 (13:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
f9e03da0b9 -s ours
Change-Id: Ibfc11d3ad1c6a5892ada761cab957f65467e511c
TreeHugger Robot [Sat, 5 Aug 2017 13:31:00 +0000 (13:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:29:59 +0000 (13:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:24:06 +0000 (13:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 5 Aug 2017 13:23:54 +0000 (13:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
e1a6bf5b74 -s ours
Change-Id: I28e2efcb3dc5df76d5e2eca6d7e6a6d9456fb4f4
Bill Yi [Sat, 5 Aug 2017 13:21:34 +0000 (13:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
c1d8698655 -s ours
Change-Id: I3da41a256cfd003197e3e56454716e16b424afa7
TreeHugger Robot [Sat, 5 Aug 2017 13:18:41 +0000 (13:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 5 Aug 2017 13:16:03 +0000 (13:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
6153572baa -s ours
Change-Id: I41025fc3f9186b33838ebe56c678ed6b229330ca
TreeHugger Robot [Sat, 5 Aug 2017 13:11:13 +0000 (13:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:10:07 +0000 (13:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:05:45 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 5 Aug 2017 09:17:44 +0000 (02:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6127e525c2824a2c947728ef94251082fd5bec14
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 5 Aug 2017 09:13:14 +0000 (02:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4e89d6ac0b96852fae1e1c8a030ffd8c5e003171
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 5 Aug 2017 07:56:19 +0000 (00:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib197bb63c3fbcef8ffc69275998deb040203f1cb
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 5 Aug 2017 07:35:11 +0000 (00:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: If4c521d07e05c2602b15d5d7752d84a57507ad92
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 5 Aug 2017 07:30:33 +0000 (00:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I53239157d82bf33503972713fe1657e2295aa526
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 5 Aug 2017 07:20:52 +0000 (00:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: If65ca28adeee2b1ae467f2e8d780e4f597a3e81e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 5 Aug 2017 07:16:15 +0000 (00:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id0b1ae5fd74159dd5d84b61f1c5f6470de295053
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 5 Aug 2017 02:45:07 +0000 (02:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
bce71a114d -s ours
Change-Id: I0ebc240ea29f0f4d97ea1c39de035654bc46b0db
Hugo Benichi [Fri, 4 Aug 2017 04:18:40 +0000 (13:18 +0900)]
NetworkCapabilities: fix describeImmutableDifferences
This patch fixes the mask used in describeImmutableDifferences which did
not correctly turn NET_CAPABILITY_NOT_METERED into bit flag.
Bug:
63326103
Test: added unit tests, runtest frameworks-net
Merged-In: Ib6b390b1daef5912859302692af7dcd6cfd3e39a
Merged-In: If38efacdeec8476880835657938e435f9b598525
Merged-In: Ieccad46fcffcaf748f5644b04617e9a82527000e
Merged-In: I533ef8fe369cec19d283ff2950314fce6e28cffd
Merged-In: I12636c6699ff60487a28570208e819ea0b66fa2e
Merged-In: Ie5df14e0ea1c12e0cfabe87978ac6c9b744353b2
(cherry picked from commit
2ecb9408f4102687f20f9ca19c13071ac6098cc6)
Change-Id: I74ecf34a2c079c74152d00caea2c220e9c6d1fa5
TreeHugger Robot [Sat, 5 Aug 2017 02:35:46 +0000 (02:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Adam Lesinski [Tue, 25 Jul 2017 00:08:32 +0000 (17:08 -0700)]
AAPT2: Add targetConfig to AndroidManifest.xml
Splits may include more/different configurations than they
were originally specified to include. This happens, for instance,
when a particular requested density doesn't exist. A fallback density
resource is chosen for the split.
This makes programmatic configuration targetting difficult, as the APK
may report that it has resources for multiple densities, while it was
meant to target only a specific density.
This change encodes a comma separated list of the intended configurations
for the split in an attribute called 'targetConfig' on the <manifest> tag of
AndroidManifest.xml.
Test: manual
Change-Id: I3167e9341a434abc34ed2ddb8f740762b40b1ab7
Adam Lesinski [Sat, 29 Jul 2017 00:10:35 +0000 (17:10 -0700)]
AAPT2: Ensure style strings are always first in StringPool
Move the styled strings to a separate section of the StringPool so
that sorting can never mess up the order of Styles.
Bug:
63570514
Test: make aapt2_tests
Change-Id: Id2ce1355b92be1bb31ce0daa7e54ae9b5b6c2ffe
Adam Lesinski [Mon, 12 Jun 2017 21:55:58 +0000 (14:55 -0700)]
AAPT2: Disable locale domination for deduping
Locale deduping isn't straightforward, as parenting rules
change between platform versions and the selection
preference of a specific locale variant over the default
configuration lead to incorrect results at runtime.
Bug:
62409213
Test: make aapt2_tests
Change-Id: Iec8f1cfba7ae43c847d163529891fdc15f3db826
Selim Cinek [Fri, 4 Aug 2017 23:53:32 +0000 (23:53 +0000)]
Merge "Fix activity start over Keyguard" into oc-dr1-dev
am:
82e815616e
Change-Id: Ic7750a2f8d0183b350e3a9ec5541f38df613fe63
Jonathan Basseri [Wed, 19 Jul 2017 20:44:31 +0000 (13:44 -0700)]
Move getNetworkCountryIso impl from TM to PIM.
This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.
Bug:
63050313
Test: no compilation errors
Merged-In: I64f31d111213281edeaeda6a09b163b860261b2d
Change-Id: I541b445b410329798acdaaaccc50955cd1574ae2
Selim Cinek [Fri, 4 Aug 2017 23:41:07 +0000 (23:41 +0000)]
Merge "Fix activity start over Keyguard" into oc-dr1-dev
pkanwar [Fri, 4 Aug 2017 23:01:23 +0000 (16:01 -0700)]
Adding strings to support warning about emergency calls.
Bug:
62618428
Test: compiles
Change-Id: I5cee8b5ebc39e4247eeff0b3e17cac3cea983894
Bill Yi [Fri, 4 Aug 2017 23:14:49 +0000 (16:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I11e8908001cbf5e33e280ca2c8fb3b30c686f3f2
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
OSDN Git Service
