OSDN Git Service
Sean Lu [Mon, 26 Jun 2017 23:09:29 +0000 (23:09 +0000)]
Merge "[Resources] house keeping in TypeList" am:
ff2e03cfce am:
516bd5f862
am:
2d604852ce
Change-Id: I983ab5312b484a8d3f8adafd693f2435c460ab5a
Sean Lu [Mon, 26 Jun 2017 23:04:56 +0000 (23:04 +0000)]
Merge "[Resources] house keeping in TypeList" am:
ff2e03cfce
am:
516bd5f862
Change-Id: I8334cb07c4cc3479e91381cb7d6be3a08b746070
Sean Lu [Mon, 26 Jun 2017 22:59:35 +0000 (22:59 +0000)]
Merge "[Resources] house keeping in TypeList"
am:
ff2e03cfce
Change-Id: I22b0a87776d794f23f70f2f9d8d885761c0b8d14
Marco Nelissen [Mon, 26 Jun 2017 22:53:04 +0000 (22:53 +0000)]
Merge "Revert "Multiple worker threads for SoundPool"" into oc-dr1-dev
am:
59a66b8601
Change-Id: I1e8e369079b649890e3313ef406c97f3ea86c0f0
Treehugger Robot [Mon, 26 Jun 2017 22:50:23 +0000 (22:50 +0000)]
Merge "[Resources] house keeping in TypeList"
TreeHugger Robot [Mon, 26 Jun 2017 22:48:00 +0000 (22:48 +0000)]
Merge "Revert "Multiple worker threads for SoundPool"" into oc-dr1-dev
Evan Laird [Mon, 26 Jun 2017 22:16:54 +0000 (22:16 +0000)]
Merge "Use BatteryMeterDrawableBase as QS icon for Battery Saver" into oc-dr1-dev
am:
be196018e1
Change-Id: Ib7f8e5e65b353bf03affc557e38d7c4ecd47d0a8
TreeHugger Robot [Mon, 26 Jun 2017 21:48:58 +0000 (21:48 +0000)]
Merge "Use BatteryMeterDrawableBase as QS icon for Battery Saver" into oc-dr1-dev
Android Build Merger (Role) [Mon, 26 Jun 2017 21:18:23 +0000 (21:18 +0000)]
Merge "Merge "Merge "Revert "Add ActivityInfo logging."" into oc-dev am:
61196fef1f" into oc-dr1-dev am:
5345fce58f" into oc-dr1-dev-plus-aosp
Bryce Lee [Mon, 26 Jun 2017 21:17:29 +0000 (21:17 +0000)]
Merge "Merge "Revert "Add ActivityInfo logging."" into oc-dev am:
61196fef1f" into oc-dr1-dev
am:
5345fce58f
Change-Id: I3b70dbc2fcdac06b83948fc7dfed82a5872028d7
Android Build Merger (Role) [Mon, 26 Jun 2017 21:16:49 +0000 (21:16 +0000)]
Merge "Merge "Log sync details to rotating log files (userdebug/eng only)" into oc-dr1-dev am:
c4e8720eb2" into oc-dr1-dev-plus-aosp
Makoto Onuki [Mon, 26 Jun 2017 21:15:26 +0000 (21:15 +0000)]
Merge "Log sync details to rotating log files (userdebug/eng only)" into oc-dr1-dev
am:
c4e8720eb2
Change-Id: Ib24297e8ca16f1f9db5f6951438f4f7006e545c7
Bryce Lee [Mon, 26 Jun 2017 21:15:25 +0000 (21:15 +0000)]
Merge "Revert "Add ActivityInfo logging."" into oc-dev am:
61196fef1f
am:
4e9f527d17
Change-Id: I891215b6bd198ded78af491e9a69e71ffbb5d805
Android Build Merger (Role) [Mon, 26 Jun 2017 20:59:50 +0000 (20:59 +0000)]
Merge "Merge "Revert "Add ActivityInfo logging."" into oc-dev am:
61196fef1f" into oc-dr1-dev
Bryce Lee [Mon, 26 Jun 2017 20:59:00 +0000 (20:59 +0000)]
Merge "Revert "Add ActivityInfo logging."" into oc-dev
am:
61196fef1f
Change-Id: I7f11b4a66def7cb49ba20a4ab4772eea0a25ef16
Bryce Lee [Mon, 26 Jun 2017 20:58:56 +0000 (20:58 +0000)]
Merge "Revert "Add ActivityInfo logging."" into oc-dev
am:
61196fef1f
Change-Id: I1ead0fd55eb35fd69a4c8e3de5a1449ce296edd9
TreeHugger Robot [Mon, 26 Jun 2017 20:58:23 +0000 (20:58 +0000)]
Merge "Log sync details to rotating log files (userdebug/eng only)" into oc-dr1-dev
Bryce Lee [Mon, 26 Jun 2017 20:50:00 +0000 (20:50 +0000)]
Merge "Revert "Add ActivityInfo logging."" into oc-dev
Android Build Merger (Role) [Mon, 26 Jun 2017 20:26:51 +0000 (20:26 +0000)]
Merge "Merge "Filter instant apps with different names" into oc-dev am:
adcc94f160 am:
a350db60bd" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 26 Jun 2017 20:26:32 +0000 (20:26 +0000)]
Merge "Merge "Filter instant apps with different names" into oc-dev am:
adcc94f160 am:
ae524ac5fa" into oc-dr1-dev-plus-aosp
Todd Kennedy [Mon, 26 Jun 2017 20:25:53 +0000 (20:25 +0000)]
Merge "Filter instant apps with different names" into oc-dev am:
adcc94f160
am:
a350db60bd
Change-Id: Ic1ee7426adb727cbe9ea208a367e57f8d1ed3514
Todd Kennedy [Mon, 26 Jun 2017 20:25:35 +0000 (20:25 +0000)]
Merge "Filter instant apps with different names" into oc-dev am:
adcc94f160
am:
ae524ac5fa
Change-Id: I4d858aec3c61899f150e1a48571d142075549654
Android Build Merger (Role) [Mon, 26 Jun 2017 20:25:25 +0000 (20:25 +0000)]
Merge "Merge "Fix QS lock screen animation" into oc-dev am:
aa2286e417 am:
a86cc7098a" into oc-dr1-dev-plus-aosp
Jason Monk [Mon, 26 Jun 2017 20:24:28 +0000 (20:24 +0000)]
Merge "Fix QS lock screen animation" into oc-dev am:
aa2286e417
am:
a86cc7098a
Change-Id: I120be1f1bda0b853fa308d996465ed9e9abfd441
Jason Monk [Mon, 26 Jun 2017 20:24:20 +0000 (20:24 +0000)]
Merge "Fix QS lock screen animation" into oc-dev am:
aa2286e417
am:
be163c055e
Change-Id: Ib65d556f261990aae6f4d93e2198c5909cf11733
Todd Kennedy [Mon, 26 Jun 2017 20:13:57 +0000 (20:13 +0000)]
Merge "Filter instant apps with different names" into oc-dev
am:
adcc94f160
Change-Id: Ia4d1b58648ceb986b0af014cb6b3a6f6c0b2ce2f
Todd Kennedy [Mon, 26 Jun 2017 20:13:41 +0000 (20:13 +0000)]
Merge "Filter instant apps with different names" into oc-dev
am:
adcc94f160
Change-Id: I855a58e6ea0655b4211f2aac0a4a1f9f94f639f2
Jason Monk [Mon, 26 Jun 2017 20:12:22 +0000 (20:12 +0000)]
Merge "Fix QS lock screen animation" into oc-dev
am:
aa2286e417
Change-Id: I1364155b6a325653d63c74ab407c787756abb5ca
Jason Monk [Mon, 26 Jun 2017 20:12:21 +0000 (20:12 +0000)]
Merge "Fix QS lock screen animation" into oc-dev
am:
aa2286e417
Change-Id: I40a6e211fa02a83de09edcfac419b8e78a287e2f
TreeHugger Robot [Mon, 26 Jun 2017 20:06:19 +0000 (20:06 +0000)]
Merge "Filter instant apps with different names" into oc-dev
TreeHugger Robot [Mon, 26 Jun 2017 19:59:20 +0000 (19:59 +0000)]
Merge "Fix QS lock screen animation" into oc-dev
Lucas Dupin [Mon, 26 Jun 2017 19:46:19 +0000 (19:46 +0000)]
Merge "Add missing ints to palette" into oc-dr1-dev
am:
56a1a7d331
Change-Id: I6534542a2ff3c2147ac20c4e3cef841483e86b20
Christine Franks [Mon, 26 Jun 2017 19:41:24 +0000 (19:41 +0000)]
Merge "Add ACTION_DISMISS_TIMER intent" into oc-dr1-dev
am:
ca4def2ac8
Change-Id: I9b847d08144f484bb68a293c0be258fb52fdeb92
TreeHugger Robot [Mon, 26 Jun 2017 19:38:38 +0000 (19:38 +0000)]
Merge "Add missing ints to palette" into oc-dr1-dev
Christine Franks [Mon, 26 Jun 2017 19:28:24 +0000 (19:28 +0000)]
Merge "Add ACTION_DISMISS_TIMER intent" into oc-dr1-dev
Pankaj Kanwar [Mon, 26 Jun 2017 18:30:11 +0000 (18:30 +0000)]
Merge "Fix the red build." into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 26 Jun 2017 18:29:42 +0000 (18:29 +0000)]
Merge "Merge "Fix TimePicker RTL issues" into oc-dev am:
7b95c932d6 am:
32974e0705" into oc-dr1-dev-plus-aosp
Chet Haase [Mon, 26 Jun 2017 18:28:50 +0000 (18:28 +0000)]
Merge "Fix TimePicker RTL issues" into oc-dev am:
7b95c932d6
am:
32974e0705
Change-Id: I452f45754547810e2c54a5fa8d792038b5f558ee
Chet Haase [Mon, 26 Jun 2017 18:28:44 +0000 (18:28 +0000)]
Merge "Fix TimePicker RTL issues" into oc-dev am:
7b95c932d6
am:
8714d472bf
Change-Id: I8a4c4bca36bec2e82993d1418e8e7697b2b14511
Evan Laird [Fri, 23 Jun 2017 20:05:33 +0000 (16:05 -0400)]
Use BatteryMeterDrawableBase as QS icon for Battery Saver
This ensures that QS, Settings, and Status bar all use the same drawable
base so they will always look the same. Battery saver is essentially a
full battery that always shows the power saver iconography.
Test: visual; runtest -x
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java
Bug:
62668861
Change-Id: I8a9d5e59c9bb38c0ef794a0ed591195809521f70
Chet Haase [Mon, 26 Jun 2017 18:18:51 +0000 (18:18 +0000)]
Merge "Fix TimePicker RTL issues" into oc-dev
am:
7b95c932d6
Change-Id: Ie1b08ed95b5182c9d8afb423153568e20ac50fe0
Chet Haase [Mon, 26 Jun 2017 18:18:46 +0000 (18:18 +0000)]
Merge "Fix TimePicker RTL issues" into oc-dev
am:
7b95c932d6
Change-Id: I9ec629e60882aec2b4ca84b0b81de4244d43afef
Chet Haase [Mon, 26 Jun 2017 18:07:25 +0000 (18:07 +0000)]
Merge "Fix TimePicker RTL issues" into oc-dev
Jeff Sharkey [Mon, 26 Jun 2017 17:02:41 +0000 (11:02 -0600)]
Fix the red build.
Change-Id: If035d6939f5a465b4b579b590f8f2b5b532e0951
(cherry picked from commit
29d670cea1c42d10274c5d97dcc8d2162540956e)
Merged-In: If035d6939f5a465b4b579b590f8f2b5b532e0951
Todd Kennedy [Mon, 26 Jun 2017 17:34:41 +0000 (10:34 -0700)]
Filter instant apps with different names
ag/
2447596 introduced a regression that caused instant apps to be
made visible to one another.
Change-Id: I5db9a43f05dd5bec991cc0934b1c9a9406dfade6
Fixes:
62998487
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Jason Monk [Mon, 26 Jun 2017 15:22:21 +0000 (11:22 -0400)]
Fix QS lock screen animation
Now that we have a footer, heights and clippings need to be adjusted
to be more accurate.
- Clip QS within its layout box regardless of its y translation
- Calculate height diffs correctly
Test: visual
Change-Id: Ic46996e342cd1000215aa9256da920a7856bb5a4
Fixes:
62489284
Jason Monk [Mon, 26 Jun 2017 17:45:52 +0000 (17:45 +0000)]
Merge "Add release haptic to nav bar buttons" into oc-dr1-dev
am:
43a0236891
Change-Id: I806d35f8a3a1f9f77b88a170add6eeaf52efb95b
Ying Xu [Mon, 26 Jun 2017 17:36:15 +0000 (17:36 +0000)]
Merge "Fix the inconsistency of scan status." am:
41be35a1bd am:
ac2d00a195
am:
e30cfbea60
Change-Id: Iaff6653418289136e24b4a1c16ee4e607d30dca0
TreeHugger Robot [Mon, 26 Jun 2017 17:32:40 +0000 (17:32 +0000)]
Merge "Add release haptic to nav bar buttons" into oc-dr1-dev
Ying Xu [Mon, 26 Jun 2017 17:27:21 +0000 (17:27 +0000)]
Merge "Fix the inconsistency of scan status." am:
41be35a1bd
am:
ac2d00a195
Change-Id: Ibcdbe63349031ea95d137dd18465bec5de6efd7a
Android Build Merger (Role) [Mon, 26 Jun 2017 17:20:12 +0000 (17:20 +0000)]
Merge "Merge "null check before dereference" into oc-dev am:
df8569787c am:
b5af86e444" into oc-dr1-dev-plus-aosp
Todd Kennedy [Mon, 26 Jun 2017 17:18:43 +0000 (17:18 +0000)]
Merge "null check before dereference" into oc-dev am:
df8569787c
am:
6939301147
Change-Id: I9867cce02601d139893edef2c2cc6f89da1d74a9
Ying Xu [Mon, 26 Jun 2017 17:18:42 +0000 (17:18 +0000)]
Merge "Fix the inconsistency of scan status."
am:
41be35a1bd
Change-Id: Ic92aa1aa9ecd91cd072257c93e12cdf030cdeba8
Todd Kennedy [Mon, 26 Jun 2017 17:18:39 +0000 (17:18 +0000)]
Merge "null check before dereference" into oc-dev am:
df8569787c
am:
b5af86e444
Change-Id: I429f077183b4815042c7bfd5661652007eff6b20
Todd Kennedy [Mon, 26 Jun 2017 17:10:14 +0000 (17:10 +0000)]
Merge "null check before dereference" into oc-dev
am:
df8569787c
Change-Id: I62067d87f75367bb527862d3ac3873b3c94c9b7c
Todd Kennedy [Mon, 26 Jun 2017 17:10:13 +0000 (17:10 +0000)]
Merge "null check before dereference" into oc-dev
am:
df8569787c
Change-Id: I41f9298e305f6f197120f2b3128187a4cbf6b28a
Ying Xu [Mon, 26 Jun 2017 17:05:57 +0000 (17:05 +0000)]
Merge "Fix the inconsistency of scan status."
Daniel Nishi [Mon, 26 Jun 2017 17:04:03 +0000 (17:04 +0000)]
Merge "Upstream getApplicationLabel()." into oc-dr1-dev
am:
7049137d7f
Change-Id: I48e3995679750566d551edc3f63fa98a55bbc75d
Sooraj Sasindran [Mon, 26 Jun 2017 17:02:16 +0000 (17:02 +0000)]
Merge "Enable 5 bar signal strength for VZW" into oc-dr1-dev
am:
b7650d2233
Change-Id: I156eb301a9fc47f3fb53eaf0efc831ea39cce84a
TreeHugger Robot [Mon, 26 Jun 2017 16:59:31 +0000 (16:59 +0000)]
Merge "null check before dereference" into oc-dev
Daniel Nishi [Mon, 26 Jun 2017 16:58:12 +0000 (16:58 +0000)]
Merge "Upstream getApplicationLabel()." into oc-dr1-dev
Sooraj Sasindran [Mon, 26 Jun 2017 16:50:20 +0000 (16:50 +0000)]
Merge "Enable 5 bar signal strength for VZW" into oc-dr1-dev
Bryce Lee [Mon, 26 Jun 2017 16:35:24 +0000 (16:35 +0000)]
Revert "Add ActivityInfo logging."
This reverts commit
7e84086387cba189bb0c20f9ed17784840a2904a.
Reason for revert: No Longer needed.
Change-Id: Id6a3c66908a0b7b2e6a666f86f30ce05d3964b4b
Pankaj Kanwar [Mon, 26 Jun 2017 16:03:06 +0000 (16:03 +0000)]
Merge "Carrier Config changes to support IMSI encryption." am:
1caaa514c9 am:
e26191a81c
am:
01741762d8
Change-Id: I385f7ce854a52533251d3777e227aeaf695bb7db
Pankaj Kanwar [Mon, 26 Jun 2017 15:55:46 +0000 (15:55 +0000)]
Merge "Carrier Config changes to support IMSI encryption." am:
1caaa514c9
am:
e26191a81c
Change-Id: I777010e6fea82f237ddf224525739a5687f13a2c
Pankaj Kanwar [Mon, 26 Jun 2017 15:48:03 +0000 (15:48 +0000)]
Merge "Carrier Config changes to support IMSI encryption."
am:
1caaa514c9
Change-Id: Ia9c4d93e8ababf87a0d6027a4322e73111651844
Pankaj Kanwar [Mon, 26 Jun 2017 15:36:43 +0000 (15:36 +0000)]
Merge "Carrier Config changes to support IMSI encryption."
Neil Fuller [Mon, 26 Jun 2017 15:09:04 +0000 (15:09 +0000)]
Merge "Avoid use of TimeZoneDistro.equals() method" am:
fe0b43cb1e am:
6b5d71f7e5
am:
9e28f78763
Change-Id: Ia4b5e3da52fabae83defcca5ab171ee46dfc12bb
Neil Fuller [Mon, 26 Jun 2017 15:01:37 +0000 (15:01 +0000)]
Merge "Avoid use of TimeZoneDistro.equals() method" am:
fe0b43cb1e
am:
6b5d71f7e5
Change-Id: Ib4d97f72a9fa936beb47267c9e9a888e306ed0e5
Neil Fuller [Mon, 26 Jun 2017 14:53:58 +0000 (14:53 +0000)]
Merge "Avoid use of TimeZoneDistro.equals() method"
am:
fe0b43cb1e
Change-Id: I8c263ce15bf29b8a14c862d9acae377ba9be77c3
Todd Kennedy [Mon, 26 Jun 2017 14:51:54 +0000 (07:51 -0700)]
null check before dereference
Change-Id: I6ae219b68920c160e104b307f60802fd75e705ce
Fixes:
62908319
Test: Manual
Paul Duffin [Mon, 26 Jun 2017 14:50:38 +0000 (14:50 +0000)]
Merge "Remove a.t.TestCase" am:
3c5ab7d324 am:
930ab689f0
am:
143f5d652c
Change-Id: I1b2212164ab566f3619cdbe307ff9ee600242424
Paul Duffin [Mon, 26 Jun 2017 14:43:13 +0000 (14:43 +0000)]
Merge "Remove a.t.TestCase" am:
3c5ab7d324
am:
930ab689f0
Change-Id: I0d61b4e26c9551d177b5bb7bbdaab25885976c0d
Treehugger Robot [Mon, 26 Jun 2017 14:40:28 +0000 (14:40 +0000)]
Merge "Avoid use of TimeZoneDistro.equals() method"
Paul Duffin [Mon, 26 Jun 2017 14:35:01 +0000 (14:35 +0000)]
Merge "Remove a.t.TestCase"
am:
3c5ab7d324
Change-Id: Id2f80c8bb95e3e64207d937929e027c49e602a72
Christine Franks [Tue, 13 Jun 2017 22:26:09 +0000 (15:26 -0700)]
Add ACTION_DISMISS_TIMER intent
Bug:
38475809
Test: manual - visual inspection of code
Change-Id: I9e58c9699fc2e6afad38db6b44f2e2b649564327
Paul Duffin [Mon, 26 Jun 2017 14:24:29 +0000 (14:24 +0000)]
Merge "Remove a.t.TestCase"
Chet Haase [Mon, 26 Jun 2017 13:44:57 +0000 (06:44 -0700)]
Fix TimePicker RTL issues
The TimePicker (seen when creating an alarm in the Clock app) has
two bugs in landscape mode:
- The hours/minutes switch places (hours should always be to the left
of minutes, regardless of RTL)
- The layout is completely messed up in 12-hour mode (the radial time picker
does not appear on the screen)
This fix addresses both issues by setting the layoutDirection="ltr"
attribute to force a couple of the layouts to be unaffected in RTL mode.
Specifically, the hours/minutes layout and the overall layout will always be
presented left-to-right.
Bug:
62846484 TimePicker layout is broken in RTL landscape mode
Test: manual (tested with/without fix in normal, forded-RTL mode, and
with Hebrew as the first locale).
Change-Id: I8ef3f2706660f60c162ba3d324a18b8f370f67f8
Paul Duffin [Mon, 26 Jun 2017 13:21:28 +0000 (13:21 +0000)]
Merge "Clean up Predicate related code in android.test" into oc-dev-plus-aosp
am:
50826c5f2e
Change-Id: Ica9b9b478b670ec5467732a09cf123dd63780c97
Paul Duffin [Mon, 26 Jun 2017 13:15:03 +0000 (13:15 +0000)]
Merge "Clean up Predicate related code in android.test" into oc-dev-plus-aosp
Hugo Benichi [Mon, 26 Jun 2017 12:12:20 +0000 (12:12 +0000)]
Merge "IpManager: always log immediate provisioning errors" am:
98f2decdad am:
2d2f66d277
am:
834cf8d664
Change-Id: I39a5752827b02e9ebefa97b831b38da2eed4ca12
Hugo Benichi [Mon, 26 Jun 2017 12:07:12 +0000 (12:07 +0000)]
Merge "IpManager: always log immediate provisioning errors" am:
98f2decdad
am:
2d2f66d277
Change-Id: If1e885c13ce7ec1f480add63940bf9bc929d5072
Hugo Benichi [Mon, 26 Jun 2017 11:57:17 +0000 (11:57 +0000)]
Merge "IpManager: always log immediate provisioning errors"
am:
98f2decdad
Change-Id: I6d745a4d6e9b932c16fe54fdabe191962389882d
Hugo Benichi [Mon, 26 Jun 2017 11:43:11 +0000 (11:43 +0000)]
Merge "IpManager: always log immediate provisioning errors"
Paul Duffin [Mon, 26 Jun 2017 11:42:54 +0000 (11:42 +0000)]
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter" am:
1ed43cafb6 am:
4601ebf945
am:
1fee4dcd5d
Change-Id: I6362ff0e8e76efd4d7b8c326f77b282740d01e03
Paul Duffin [Mon, 26 Jun 2017 11:35:00 +0000 (11:35 +0000)]
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter" am:
1ed43cafb6
am:
4601ebf945
Change-Id: Icf7b8d1f5a3e0d18cd9a096a8171d6dab98b5992
Paul Duffin [Mon, 26 Jun 2017 11:27:36 +0000 (11:27 +0000)]
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter"
am:
1ed43cafb6
Change-Id: If185962713352c4ce4e0ff27bc333e5eededde7f
Paul Duffin [Mon, 26 Jun 2017 11:21:19 +0000 (11:21 +0000)]
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter"
Neil Fuller [Thu, 22 Jun 2017 13:10:29 +0000 (14:10 +0100)]
Avoid use of TimeZoneDistro.equals() method
The TimeZoneDistro method is going away.
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above
Test: Manual
Bug:
31008728
Change-Id: Id90cf7ce534b888bf6df1bf1dc9d497608dcdbe9
Sean Lu [Mon, 26 Jun 2017 10:19:28 +0000 (18:19 +0800)]
[Resources] house keeping in TypeList
Symptom: Type was freed but still may be access
Root Cause: TypeList not cleared
Solution: clear the TypeList
Project: AOSP
Note: None
Test: Yes
Change-Id: I00225165a30d15a299b7a483ea393b4447d2a3fc
Adam Vartanian [Mon, 26 Jun 2017 10:12:56 +0000 (10:12 +0000)]
Merge "Add libcrypto to shared libraries of core/jni" into oc-dev-plus-aosp
am:
c584a2596e
Change-Id: I0eff66034ec46c33dd733cffabeacae1ee53db35
Adam Vartanian [Mon, 26 Jun 2017 10:08:23 +0000 (10:08 +0000)]
Merge "Add libcrypto to shared libraries of core/jni" into oc-dev-plus-aosp
Adam Vartanian [Mon, 26 Jun 2017 09:43:38 +0000 (10:43 +0100)]
Add libcrypto to shared libraries of core/jni
This was added to master in ag/
2447995 but not to aosp in aosp/420427,
which resulted in a failure in this branch.
Bug:
62991913
Test: make
Change-Id: Iefa0254c91e83da737a160f851c97ab3e6a7b0f8
Merged-In: I547bb838befa743d72d356c186ff3cd355736589
Paul Duffin [Mon, 26 Jun 2017 09:41:44 +0000 (09:41 +0000)]
Merge "Clean up TestCaseUtil" am:
43851d01d8 am:
e38d503394
am:
b5b6e7cf45
Change-Id: I98265e973df1bf7ac28b7f79f6ccd0a865762304
Paul Duffin [Mon, 26 Jun 2017 09:33:23 +0000 (09:33 +0000)]
Merge "Clean up TestCaseUtil" am:
43851d01d8
am:
e38d503394
Change-Id: I62a80b405d05ec7b4da050bd6b01df4c965d6187
Paul Duffin [Mon, 26 Jun 2017 09:24:39 +0000 (09:24 +0000)]
Merge "Clean up TestCaseUtil"
am:
43851d01d8
Change-Id: I5a56102b06053eb92583457105adf7e88bdb5502
Paul Duffin [Mon, 26 Jun 2017 09:15:05 +0000 (09:15 +0000)]
Merge "Clean up TestCaseUtil"
Richard Uhler [Mon, 26 Jun 2017 09:01:32 +0000 (09:01 +0000)]
Fix bug in reporting SwapPss in dumpsys meminfo.
am:
a178205e8b
Change-Id: I49c805c6fab673008b18a5a8deb256ec2a5fb970
Richard Uhler [Fri, 23 Jun 2017 15:54:25 +0000 (16:54 +0100)]
Fix bug in reporting SwapPss in dumpsys meminfo.
Bug:
29875093
Test: Run dumpsys meminfo -a, verify SwapPss adds up and is non-zero
for dalvik and native.
Change-Id: I79d0b6a59bf5f4e73f75f0b9540ec0fcc9e23b02
pkanwar [Wed, 31 May 2017 20:10:03 +0000 (13:10 -0700)]
Carrier Config changes to support IMSI encryption.
Adding 2 config parameters to CarrierConfigManager:
1. imsi_key_download_url.
2. imsi_key_expiration_days_time.
BUG:
35606429
Test: manual
Change-Id: I191dd0db5fa84a57faea88cb59c2c0b2604064b2
OSDN Git Service
