OSDN Git Service
Matthew Ng [Tue, 8 Aug 2017 00:56:19 +0000 (00:56 +0000)]
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev am:
673e3c41ec am:
b9bfe2865f
am:
5711c09fc7
Change-Id: I33d914176b6c0b31e664d80788e17870b3ff0194
Matthew Ng [Tue, 8 Aug 2017 00:55:08 +0000 (00:55 +0000)]
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev am:
c7d24aed82 am:
58e0363930
am:
64b013e5b6
Change-Id: Ie0580efb4e6374115f61dc0ca3da268d1e8c6f0d
Tomasz Wasilczyk [Tue, 8 Aug 2017 00:49:24 +0000 (00:49 +0000)]
Merge "Change VENDOR program types to range." into oc-mr1-dev am:
ecacb9850c
am:
24d0f84bf1
Change-Id: Idc444801a6da7c19cfa947db07d84f24162a52c4
Matthew Ng [Tue, 8 Aug 2017 00:47:46 +0000 (00:47 +0000)]
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev am:
673e3c41ec
am:
b9bfe2865f
Change-Id: I0840526f8b5c283354ebf0537336d85646376fea
Matthew Ng [Tue, 8 Aug 2017 00:46:51 +0000 (00:46 +0000)]
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev am:
c7d24aed82
am:
58e0363930
Change-Id: I3c810fed6bec57d40288564673cfa8830754da31
Tomasz Wasilczyk [Tue, 8 Aug 2017 00:41:04 +0000 (00:41 +0000)]
Merge "Change VENDOR program types to range." into oc-mr1-dev
am:
ecacb9850c
Change-Id: I702d77c693303f903d1daabd8746a4d5ea4cfb5f
Matthew Ng [Tue, 8 Aug 2017 00:38:46 +0000 (00:38 +0000)]
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev
am:
673e3c41ec
Change-Id: If07c7fb08169ab3084fdf97d8190285220efe0f9
Matthew Ng [Tue, 8 Aug 2017 00:37:50 +0000 (00:37 +0000)]
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev
am:
c7d24aed82
Change-Id: I36fe4faa536412c3de98b01034f2f22e95d15155
Tomasz Wasilczyk [Tue, 8 Aug 2017 00:35:09 +0000 (00:35 +0000)]
Merge "Change VENDOR program types to range." into oc-mr1-dev
Calin Juravle [Tue, 8 Aug 2017 00:32:36 +0000 (00:32 +0000)]
Merge "Change the location of current profiles for secondary dex files" into oc-mr1-dev am:
284b584499
am:
b2963f3351
Change-Id: I6de5ec46a0d93de01acec80a43a8856ca74dc488
TreeHugger Robot [Tue, 8 Aug 2017 00:32:09 +0000 (00:32 +0000)]
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 00:32:09 +0000 (00:32 +0000)]
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 00:26:31 +0000 (00:26 +0000)]
Merge "AAPT2: Change proto format to reduce usage of StringPool"
Calin Juravle [Tue, 8 Aug 2017 00:24:40 +0000 (00:24 +0000)]
Merge "Change the location of current profiles for secondary dex files" into oc-mr1-dev
am:
284b584499
Change-Id: Ib8f8156b0610dc7aaf892c1d049c94232938a565
Calin Juravle [Tue, 8 Aug 2017 00:17:44 +0000 (00:17 +0000)]
Merge "Change the location of current profiles for secondary dex files" into oc-mr1-dev
Felipe Leme [Tue, 8 Aug 2017 00:01:28 +0000 (00:01 +0000)]
Merge "Minor Autofill changes after API council review." into oc-mr1-dev am:
be3e4a6285
am:
a9adf37e1d
Change-Id: Ic266dfc62284b345f707a3dee36e0dcf4faca328
Sudheer Shanka [Mon, 7 Aug 2017 23:54:43 +0000 (23:54 +0000)]
Merge "Track per-cluster times of each uid in microsec." into oc-mr1-dev am:
e913d8235c
am:
b60349a5e1 -s ours
Change-Id: I169f4ffeabee10dba1bdcd8b80c46ac17b33b4ab
Felipe Leme [Mon, 7 Aug 2017 23:53:09 +0000 (23:53 +0000)]
Merge "Minor Autofill changes after API council review." into oc-mr1-dev
am:
be3e4a6285
Change-Id: Ia2c1c3cf1987ac0567a6d04e8f9c10d4f2b62539
Zheng Zhang [Mon, 7 Aug 2017 23:44:42 +0000 (23:44 +0000)]
Merge "Catch (and ignore) any timeout exceptions when releasing WakeLock" into oc-mr1-dev am:
3f02441588
am:
cce662f23d
Change-Id: Id1390ada1a67e47261eba2cf05b0e6f0817959a0
Sudheer Shanka [Mon, 7 Aug 2017 23:43:22 +0000 (23:43 +0000)]
Merge "Track per-cluster times of each uid in microsec." into oc-mr1-dev
am:
e913d8235c
Change-Id: I7915fe5d7df2b2ac49f2b97afba486782a1c8208
Adam Bookatz [Mon, 7 Aug 2017 23:42:05 +0000 (23:42 +0000)]
Merge "Package wakeup alarms are now on screen-off timebase" into oc-mr1-dev am:
0a1ae1bc56
am:
e4fa69b956
Change-Id: I98043b43051f84cf99cf21d0b83ebf75b6076ab9
Zheng Zhang [Mon, 7 Aug 2017 23:35:59 +0000 (23:35 +0000)]
Merge "Catch (and ignore) any timeout exceptions when releasing WakeLock" into oc-mr1-dev
am:
3f02441588
Change-Id: Idf7f29533bad1eb6c6b9ea8dc1ca9c60e63103d3
TreeHugger Robot [Mon, 7 Aug 2017 23:35:56 +0000 (23:35 +0000)]
Merge "Minor Autofill changes after API council review." into oc-mr1-dev
Adam Bookatz [Mon, 7 Aug 2017 23:33:44 +0000 (23:33 +0000)]
Merge "Package wakeup alarms are now on screen-off timebase" into oc-mr1-dev
am:
0a1ae1bc56
Change-Id: Ie4b8379cd5bc6622ecc07868cdcf4eac0af1cf61
Sudheer Shanka [Mon, 7 Aug 2017 23:32:50 +0000 (23:32 +0000)]
Merge "Track per-cluster times of each uid in microsec." into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 23:28:50 +0000 (23:28 +0000)]
Merge "Catch (and ignore) any timeout exceptions when releasing WakeLock" into oc-mr1-dev
Adam Bookatz [Mon, 7 Aug 2017 23:22:31 +0000 (23:22 +0000)]
Merge "Package wakeup alarms are now on screen-off timebase" into oc-mr1-dev
Yohei Yukawa [Mon, 7 Aug 2017 22:54:32 +0000 (22:54 +0000)]
Merge "Bind SpellCheckerService as IMPORTANT_BACKGROUND" into oc-mr1-dev am:
cb921c1efc
am:
5778e85c6d
Change-Id: I6a1ffc12c4a066075828e7d4555f4df9d5f764e5
Andrii Kulian [Mon, 7 Aug 2017 22:46:45 +0000 (22:46 +0000)]
Merge "Merge "Add black frame behind app window" into oc-dr1-dev am:
cbdaf04101 am:
66994114e7" into oc-mr1-dev-plus-aosp
am:
485d03a549
Change-Id: Ia8d5e1383b42eb9fb6755bc1d799ad689ba9358b
Andrii Kulian [Mon, 7 Aug 2017 22:44:41 +0000 (22:44 +0000)]
Merge "Merge "Add black frame behind app window" into oc-dr1-dev am:
cbdaf04101 am:
cdcc9dd0dd" into oc-mr1-dev-plus-aosp
am:
5c6f9676cb
Change-Id: Ifb0afb96bea83d9b05e0fd6db9e78bb8e0375de7
Adam Lesinski [Mon, 7 Aug 2017 22:42:27 +0000 (22:42 +0000)]
Merge "AAPT2: Add targetConfig to AndroidManifest.xml" into oc-mr1-dev am:
a5fc11d78e
am:
ff9914ee56
Change-Id: I1c298cfc416aadea07a1da9eadf6a8e72800c296
Yohei Yukawa [Mon, 7 Aug 2017 22:39:25 +0000 (22:39 +0000)]
Merge "Bind SpellCheckerService as IMPORTANT_BACKGROUND" into oc-mr1-dev
am:
cb921c1efc
Change-Id: I2245b196229aa590df1c65c0b44be1bab6f85e96
Yohei Yukawa [Mon, 7 Aug 2017 22:34:51 +0000 (22:34 +0000)]
Merge "Bind SpellCheckerService as IMPORTANT_BACKGROUND" into oc-mr1-dev
Android Build Merger (Role) [Mon, 7 Aug 2017 22:32:40 +0000 (22:32 +0000)]
Merge "Merge "Add black frame behind app window" into oc-dr1-dev am:
cbdaf04101 am:
66994114e7" into oc-mr1-dev-plus-aosp
Adam Lesinski [Mon, 7 Aug 2017 22:32:21 +0000 (22:32 +0000)]
Merge "AAPT2: Ensure style strings are always first in StringPool" into oc-mr1-dev am:
0dcfee3154
am:
e5ebdc3c97
Change-Id: Ib459bee7f194720635518962c65d6ecb38e69108
Android Build Merger (Role) [Mon, 7 Aug 2017 22:31:33 +0000 (22:31 +0000)]
Merge "Merge "Add black frame behind app window" into oc-dr1-dev am:
cbdaf04101 am:
cdcc9dd0dd" into oc-mr1-dev-plus-aosp
Andrii Kulian [Mon, 7 Aug 2017 22:31:03 +0000 (22:31 +0000)]
Merge "Add black frame behind app window" into oc-dr1-dev am:
cbdaf04101
am:
66994114e7
Change-Id: I58305f008170c734e1c7291ff53f16e87776fe08
Andrii Kulian [Mon, 7 Aug 2017 22:29:34 +0000 (22:29 +0000)]
Merge "Add black frame behind app window" into oc-dr1-dev am:
cbdaf04101
am:
cdcc9dd0dd
Change-Id: I1391ee22429cbc3cefe7f16fb9e2cc76d48ec870
Adam Lesinski [Mon, 7 Aug 2017 22:28:43 +0000 (22:28 +0000)]
Merge "AAPT2: Add targetConfig to AndroidManifest.xml" into oc-mr1-dev
am:
a5fc11d78e
Change-Id: Id751b5a4c087fa062a31e88e153302a326fe34a8
Adam Lesinski [Mon, 7 Aug 2017 22:25:35 +0000 (22:25 +0000)]
Merge "AAPT2: Ensure style strings are always first in StringPool" into oc-mr1-dev
am:
0dcfee3154
Change-Id: Id820dff95bf26f0186f64b31a14f4032bd3f76ec
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
Andrii Kulian [Mon, 7 Aug 2017 22:20:21 +0000 (22:20 +0000)]
Merge "Add black frame behind app window" into oc-dr1-dev
am:
cbdaf04101
Change-Id: I121cca690aca4f2c9552440a47165b34fcb26d8b
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
Hangyu Kuang [Mon, 7 Aug 2017 21:51:46 +0000 (21:51 +0000)]
Merge "media: Address api council comments." into oc-mr1-dev am:
d3cef1bf7c
am:
515b44b35f
Change-Id: I6e09042855c933647c5f08955e06378dbc56f324
Yi Jin [Mon, 7 Aug 2017 21:43:28 +0000 (21:43 +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 am:
8ce50255c5
am:
311cc0b99d
Change-Id: I0bae1c8199771608571c208cb176c1c66f5ef08f
Makoto Onuki [Mon, 7 Aug 2017 21:41:12 +0000 (21:41 +0000)]
Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev am:
ce3e863f31
am:
a0518fb7ac
Change-Id: I02cfeba937fac4815c55ea158dfdc9723a2a2031
Hangyu Kuang [Mon, 7 Aug 2017 21:37:53 +0000 (21:37 +0000)]
Merge "media: Address api council comments." into oc-mr1-dev
am:
d3cef1bf7c
Change-Id: If50d3455d37915935aa7f8141aa99221374b3048
Yi Jin [Mon, 7 Aug 2017 21:26:37 +0000 (21:26 +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
am:
8ce50255c5
Change-Id: I0ece40e7e6fb98d3c029bd26d6b35fbcb1ee66c0
Makoto Onuki [Mon, 7 Aug 2017 21:24:33 +0000 (21:24 +0000)]
Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev
am:
ce3e863f31
Change-Id: I67798ee72499d25bed4fc902baf7e92909dffdca
TreeHugger Robot [Mon, 7 Aug 2017 21:20:54 +0000 (21:20 +0000)]
Merge "media: Address api council comments." into oc-mr1-dev
Zheng Zhang [Mon, 7 Aug 2017 20:51:23 +0000 (13:51 -0700)]
Catch (and ignore) any timeout exceptions when releasing WakeLock
Bug:
64424030
Change-Id: I4f1f71bc4f16d1485b360aec70c82818aa7510fb
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:33:51 +0000 (20:33 +0000)]
Merge "Revert "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT"" into oc-mr1-dev am:
e2dc2d9e9a
am:
7b2c3a73b4
Change-Id: I49c2e7048fdf6d72363f42b8f885f62079125e3f
Colin Cross [Mon, 7 Aug 2017 20:31:59 +0000 (20:31 +0000)]
Merge "Use class retention for VisibleForTesting annotations" am:
5724841581 am:
94d5456d0e am:
a5538805d9 am:
2130e26bca
am:
205ba7160b -s ours
Change-Id: If595d79becbb94232d3e93b51ecc2f9f15182c3b
Adrian Roos [Mon, 7 Aug 2017 20:30:04 +0000 (20:30 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev am:
2b7fbd010e am:
94fa7f2194
am:
fc480e0ca6
Change-Id: Id39d8bf68925d30ecde62189c6adfb0d13a14071
Peter Qiu [Mon, 7 Aug 2017 20:22:03 +0000 (20:22 +0000)]
Merge "Revert "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT"" into oc-mr1-dev
am:
e2dc2d9e9a
Change-Id: I10d6289b59c99cacc35fbed9295160cba1a7f6de
Colin Cross [Mon, 7 Aug 2017 20:15:17 +0000 (20:15 +0000)]
Merge "Use class retention for VisibleForTesting annotations" am:
5724841581 am:
94d5456d0e am:
a5538805d9
am:
2130e26bca
Change-Id: I3c4199fa186374bc8adc2d3068bba102c6da4df8
Adrian Roos [Mon, 7 Aug 2017 20:12:57 +0000 (20:12 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev am:
2b7fbd010e
am:
94fa7f2194
Change-Id: Ie868bf3f76fa6e38137593a77d0b35a14b4ab1bb
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
Colin Cross [Mon, 7 Aug 2017 19:56:23 +0000 (19:56 +0000)]
Merge "Use class retention for VisibleForTesting annotations" am:
5724841581 am:
94d5456d0e
am:
a5538805d9
Change-Id: I83547deec96de1a26318c30d9ed01865d1be4254
Colin Cross [Mon, 7 Aug 2017 19:44:57 +0000 (19:44 +0000)]
Merge "Use class retention for VisibleForTesting annotations" am:
5724841581
am:
94d5456d0e
Change-Id: I3309ee0b936eb9d36a453beb084be31e046c1bf5
Colin Cross [Mon, 7 Aug 2017 19:32:21 +0000 (19:32 +0000)]
Merge "Use class retention for VisibleForTesting annotations"
am:
5724841581
Change-Id: Iaa9262ad627b49d58b46760d7aecd3a985c3a79a
Treehugger Robot [Mon, 7 Aug 2017 19:17:33 +0000 (19:17 +0000)]
Merge "Use class retention for VisibleForTesting annotations"
Adrian Roos [Mon, 7 Aug 2017 19:05:02 +0000 (19:05 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev am:
2b7fbd010e am:
ceb0963f44
am:
7bc54b9b39
Change-Id: Ia7790570f8e96463eb25b9f84f02896e30ec1433
Peter Qiu [Mon, 7 Aug 2017 19:02:45 +0000 (19:02 +0000)]
Merge "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev am:
cbf16572eb
am:
25a08bb2f2
Change-Id: I94f6dafb4b2dbcc060fe0dc8904a39bae7f8ba14
Adrian Roos [Mon, 7 Aug 2017 18:53:04 +0000 (18:53 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev am:
2b7fbd010e
am:
ceb0963f44
Change-Id: Ib27b4d5f6252fc5349e391dbb375834d0e42b80b
TreeHugger Robot [Mon, 7 Aug 2017 18:50:49 +0000 (18:50 +0000)]
Merge "Move LogPersist to SettingsLib"
Adam Lesinski [Fri, 4 Aug 2017 23:15:17 +0000 (16:15 -0700)]
AAPT2: Change proto format to reduce usage of StringPool
The StringPool class is a binary blob and makes it difficult to
modify the proto files from external tools (like bundle-tool).
Size increase of full build is negligible.
Test: make aapt2_tests
Change-Id: I984755170c315730ab751b51133f8fb2f614f6af
Adrian Roos [Mon, 7 Aug 2017 18:41:07 +0000 (18:41 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev
am:
2b7fbd010e
Change-Id: If4ed2779d3fd1a2f2b3f2dc65d0d7a9a1d7d72bc
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
Peter Qiu [Mon, 7 Aug 2017 18:36:58 +0000 (18:36 +0000)]
Merge "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev
am:
cbf16572eb
Change-Id: I6fbc6670e35c51c8db2352df933e5018261fa344
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
Matthew Ng [Wed, 2 Aug 2017 21:00:59 +0000 (14:00 -0700)]
Reset wait for transition state to false when recents goes invisible
From ag/
2572257, this change will ensure the transition wait flag to be
false when recents runs "onStop" or when it becomes invisible. This
should fix edge cases when a user goes from Recents to somewhere that
is not a fullscreen app (like home). Resetting the state should allow
users to use the recents button without getting blocked.
There is only two locations where the flag is set to true, when user
starts recents and when an app is started from recents. When a user goes
from recents to home with the recents button (when the phone gets into a
wierd state), then the flag is true but home does not reset the flag
because the old change expects a non-home app to start. Now whenever
recents is dismissed, the flag will be reset.
Fixes:
37277853
Bug:
64098508
Test: start recents with apps in it, go to guest account, start apps in
recents, go back to main account, unlock keyguard, press recents button
to dismiss recents (do not press home or back), it will go to home,
press recents again
Change-Id: I07c292d701a621685c836a4f6040864377f0a3dd
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 18:07:36 +0000 (18:07 +0000)]
Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev am:
242c22c900 am:
62e72c21f5
am:
2e60ba0a03
Change-Id: Idd3e202a71be7e19aed1d2428e9a2efa6eb5abab
Colin Cross [Fri, 4 Aug 2017 23:39:05 +0000 (16:39 -0700)]
Use class retention for VisibleForTesting annotations
The VisibleForTesting annotations are used by proguard to prevent
stripping code that is needed at runtime for tests. The annotations
were marked with source retention, which worked fine with Jack's
proguard implementation. When we switched back to javac + proguard,
the VisibleForTesting annotations are gone by the time proguard
sees the classes, so the annotated classes and methods can still
be stripped.
Move the VisibleForTesting annotation to class retention, which
matches guava's equivalent annotation.
Bug:
64365384
Test: m -j MtpDocumentsProvider &&
javap -cp out/target/common/obj/APPS/MtpDocumentsProvider_intermediates/classes-proguard.jar com.android.mtp.MtpRoot
Change-Id: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
Merged-In: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
(cherry picked from commit
8e846143ddc285117d391561de7abd670078d27f)
Adam Lesinski [Mon, 7 Aug 2017 18:03:19 +0000 (18:03 +0000)]
Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev am:
242c22c900 am:
dc901a6318
am:
36aa7b6156
Change-Id: Ifb3ee9eb8a98c2aaac09525b1bc55e01a286e0fc
Adam Lesinski [Mon, 7 Aug 2017 17:58:43 +0000 (17:58 +0000)]
Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev am:
242c22c900
am:
62e72c21f5
Change-Id: I911580693ea5fcba1581726a837bbad5104402bf
Colin Cross [Mon, 7 Aug 2017 17:55:23 +0000 (17:55 +0000)]
Merge "Use class retention for VisibleForTesting annotations"
Adam Lesinski [Mon, 7 Aug 2017 17:51:36 +0000 (17:51 +0000)]
Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev am:
242c22c900
am:
dc901a6318
Change-Id: Ic9ff5a40d228396734b314f8e6bd68d7152986cd
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
Adam Lesinski [Mon, 7 Aug 2017 17:43:05 +0000 (17:43 +0000)]
Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev
am:
242c22c900
Change-Id: I8fa65b89f1f10fe8920aa45d14c7b917b6bc74d8
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:32:55 +0000 (17:32 +0000)]
Merge "Location: adding NULL check for the LPP_PROFILE property am:
8eec744ccb am:
fe7865b10d" into oc-mr1-dev-plus-aosp
am:
76f8762220
Change-Id: Ib5bb9f59d79a6f7d13798f39aeaff7a60916c5a8
Ecco Park [Mon, 7 Aug 2017 17:31:02 +0000 (17:31 +0000)]
Location: adding NULL check for the LPP_PROFILE property am:
8eec744ccb am:
13fac42125
am:
ecc493dbfe
Change-Id: Ief3b299ea0384b5ced134f0045857b25ddf21df9
Android Build Merger (Role) [Mon, 7 Aug 2017 17:27:18 +0000 (17:27 +0000)]
Merge "Location: adding NULL check for the LPP_PROFILE property am:
8eec744ccb am:
fe7865b10d" into oc-mr1-dev-plus-aosp
Ecco Park [Mon, 7 Aug 2017 17:24:35 +0000 (17:24 +0000)]
Location: adding NULL check for the LPP_PROFILE property am:
8eec744ccb
am:
fe7865b10d
Change-Id: I6e919aba831bdd4d42aee2510ab4118cb7c98a3e
Ecco Park [Mon, 7 Aug 2017 17:24:28 +0000 (17:24 +0000)]
Location: adding NULL check for the LPP_PROFILE property am:
8eec744ccb
am:
13fac42125
Change-Id: I16cdfb5701b49eba76b8866e872301bce387de4c
Tomasz Wasilczyk [Fri, 4 Aug 2017 19:56:47 +0000 (12:56 -0700)]
Change VENDOR program types to range.
Bug: b/
64331420
Test: instrumentation
Change-Id: If5c56f09e2b9e272a40f0ca074a590ca6ec3a703
Ecco Park [Mon, 7 Aug 2017 17:18:58 +0000 (17:18 +0000)]
Location: adding NULL check for the LPP_PROFILE property
am:
8eec744ccb
Change-Id: Ic8b63fd181eeaa2272113fdd5fb70c4dbee46357
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:50:38 +0000 (16:50 +0000)]
Merge "Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev am:
35a563ef62 am:
c75e254eb4" into oc-mr1-dev-plus-aosp
am:
788290f049 -s ours
Change-Id: I6fee6f98e67f86f61be245131413e636e2e94a1a
Jonathan Basseri [Mon, 7 Aug 2017 16:46:38 +0000 (16:46 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev am:
35a563ef62 am:
c75e254eb4
am:
85e932ebf6 -s ours
Change-Id: I7041080b22fe626f4942a2b4b5c9e599a8db99f3
Jonathan Basseri [Mon, 7 Aug 2017 16:38:45 +0000 (16:38 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev am:
35a563ef62 am:
b901f055b5
am:
47a639b4e6 -s ours
Change-Id: I3c8d0aa0b96f413962862f2946c7df404d07ff66
Android Build Merger (Role) [Mon, 7 Aug 2017 16:36:19 +0000 (16:36 +0000)]
Merge "Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev am:
35a563ef62 am:
c75e254eb4" into oc-mr1-dev-plus-aosp
OSDN Git Service
