OSDN Git Service
TreeHugger Robot [Sat, 21 Jan 2017 01:17:37 +0000 (01:17 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 21 Jan 2017 01:09:23 +0000 (01:09 +0000)]
Merge "Add ClipData.addItem(Item, ContentResolver)"
TreeHugger Robot [Sat, 21 Jan 2017 00:59:16 +0000 (00:59 +0000)]
Merge "Set permissions for launching on private displays"
TreeHugger Robot [Sat, 21 Jan 2017 00:31:15 +0000 (00:31 +0000)]
Merge "Remove style TextAppearance.StatusBar.TextButton"
TreeHugger Robot [Sat, 21 Jan 2017 00:29:18 +0000 (00:29 +0000)]
Merge "Updating picture-in-picture API."
David Ouyang [Sat, 21 Jan 2017 00:28:14 +0000 (00:28 +0000)]
Merge "Promote DevicePolicyManager.packageHasActiveAdmins for Play Store"
TreeHugger Robot [Fri, 20 Jan 2017 23:58:28 +0000 (23:58 +0000)]
Merge "Remove call to propagate permissions"
TreeHugger Robot [Fri, 20 Jan 2017 23:54:08 +0000 (23:54 +0000)]
Merge "Added open, dismiss and split screen as custom accessibility actions"
Jean-Michel Trivi [Fri, 20 Jan 2017 23:42:41 +0000 (23:42 +0000)]
Merge "Notification player: do not use stream types"
Amin Shaikh [Fri, 20 Jan 2017 23:40:40 +0000 (23:40 +0000)]
Merge "Add additional fields to RecommendationRequest." am:
b8f0e69ef0 am:
ac05acad45 am:
b7b9c6f889
am:
746a4de692 -s ours
Change-Id: I542c5562210e309bf17c235225051ab42c8d0f65
Vladislav Kaznacheev [Wed, 23 Nov 2016 23:31:13 +0000 (15:31 -0800)]
Add ClipData.addItem(Item, ContentResolver)
Unlike the existing addItem(Item), this method updates
the MIME type list in the ClipDescription.
Bug:
28750744
Test: cts-tradefed ... -m CtsContentTestCases
--test android.content.cts.ClipboardManagerTest
Change-Id: Ida0477267d1319a31a738dfd704c0af71928dd2f
Makoto Onuki [Fri, 20 Jan 2017 23:35:49 +0000 (23:35 +0000)]
Merge "Do not allow work profile apps to access main profile app."
Amin Shaikh [Fri, 20 Jan 2017 23:30:39 +0000 (23:30 +0000)]
Merge "Add additional fields to RecommendationRequest." am:
b8f0e69ef0 am:
ac05acad45
am:
b7b9c6f889
Change-Id: Ieade1643bfc4c9039d6d4f702bf3ec527679ce74
Amin Shaikh [Fri, 20 Jan 2017 23:23:39 +0000 (23:23 +0000)]
Merge "Add additional fields to RecommendationRequest." am:
b8f0e69ef0
am:
ac05acad45
Change-Id: I1062446bbd085b794bfe61843e670dc5af689d32
Rebecca Silberstein [Fri, 20 Jan 2017 23:20:38 +0000 (23:20 +0000)]
Merge "SystemServer: reorder wifi services start" am:
10c514d9de am:
eae39fd1ec am:
5c00ee28b2
am:
844e5436a6 -s ours
Change-Id: I850b8a881ade0bdf2ea3a3de3ccfefa74e72dd51
Amin Shaikh [Fri, 20 Jan 2017 23:18:02 +0000 (23:18 +0000)]
Merge "Add additional fields to RecommendationRequest."
am:
b8f0e69ef0
Change-Id: I9a50c8aca36cf740abbc62af6879b4e6ea736855
Chris Phoenix [Fri, 20 Jan 2017 23:17:14 +0000 (23:17 +0000)]
Merge "TvInput HAL uses "default" service name"
Andrii Kulian [Tue, 17 Jan 2017 19:17:34 +0000 (11:17 -0800)]
Set permissions for launching on private displays
- System UIDs must be allowed to launch anything and everywhere.
- Display owner must be allowed to launch activities on it.
- Apps that are already on target display must be allowed to launch
there.
- All other apps mustn't be allowed to launch on private displays.
Bug:
34230873
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testPermissionLaunchFromSystem
Test: #testPermissionLaunchFromAppOnSecondary
Test: #testPermissionLaunchFromOwner
Test: #testPermissionLaunchFromDifferentApp
Change-Id: Ic98005649a6368370c512e822cba4e9decc18ae9
Rebecca Silberstein [Fri, 20 Jan 2017 23:13:38 +0000 (23:13 +0000)]
Merge "SystemServer: reorder wifi services start" am:
10c514d9de am:
eae39fd1ec
am:
5c00ee28b2
Change-Id: Id6eb74c4aab2cd25f1d7adff4ddff160f6132fc6
Jeff Sharkey [Fri, 20 Jan 2017 23:12:19 +0000 (23:12 +0000)]
Merge "Add Binder support for Parcelable exceptions." am:
a2ef6b5741 am:
c3fbf32011 am:
4a0a4664b9
am:
7bb9ccc1e5
Change-Id: I9346a576d57c9f7093b875c4a43134f2ef095018
Sunny Goyal [Fri, 20 Jan 2017 23:07:18 +0000 (23:07 +0000)]
Merge "Fixing dimensions for AppWidgetProviderInfo not getting updated properly for PinItemRequest"
Rebecca Silberstein [Fri, 20 Jan 2017 23:07:10 +0000 (23:07 +0000)]
Merge "SystemServer: reorder wifi services start" am:
10c514d9de
am:
eae39fd1ec
Change-Id: I723d8b96f5d5406e8f948885a845993e755ab0d8
Dianne Hackborn [Fri, 20 Jan 2017 23:05:37 +0000 (23:05 +0000)]
Merge "Improve behavior of bg check."
Treehugger Robot [Fri, 20 Jan 2017 23:04:54 +0000 (23:04 +0000)]
Merge "Add additional fields to RecommendationRequest."
Dianne Hackborn [Thu, 12 Jan 2017 23:10:57 +0000 (15:10 -0800)]
Improve behavior of bg check.
There is a new APP_START_MODE_DELAYED_RIGID which means that
things discovering something is not allowed to start should
report a clear error back to the caller. This is how apps
that opt in to bg check should behave, and will now
be used if the app op mode is set to ERRORED.
This (for now?) removes the code that allows services to
be started if the request is coming from a foreground process.
That behavior isn't in the current bg check spec, and
probably not what we want as the standard platform model (since
it makes knowing when a service can start even harder to
determine). It was originally done for the experimental
bg check work in N to see how much we could avoid
breaking existing apps, so not relevant when apps need to
explicitly opt in.
Also report temporary whitelist changes to activity manager for
it to lift background restrictions temporarily for apps. Being
on the whitelist is now part of UidRecord, preventing a uid from
going idle.
Test: Initial CTS test added.
Change-Id: I36fd906fa69de8b7ff360605ae17c088f182e172
Jeff Sharkey [Fri, 20 Jan 2017 23:03:40 +0000 (23:03 +0000)]
Merge "Add Binder support for Parcelable exceptions." am:
a2ef6b5741 am:
c3fbf32011
am:
4a0a4664b9
Change-Id: I9b5667ca6e5497a4eedaaf88979a1a3d0e22c174
Rebecca Silberstein [Fri, 20 Jan 2017 23:00:13 +0000 (23:00 +0000)]
Merge "SystemServer: reorder wifi services start"
am:
10c514d9de
Change-Id: I3a918b707932084759701103c683fffed0e16cee
Jiuyu Sun [Fri, 20 Jan 2017 22:58:21 +0000 (22:58 +0000)]
Merge "Change the default behavior when MCC/MNC changes."
Jeff Sharkey [Fri, 20 Jan 2017 22:56:45 +0000 (22:56 +0000)]
Merge "Add Binder support for Parcelable exceptions." am:
a2ef6b5741
am:
c3fbf32011
Change-Id: Ibd977a017ce48f0791520af3500969aec0c132e5
Rebecca Silberstein [Fri, 20 Jan 2017 22:51:35 +0000 (22:51 +0000)]
Merge "SystemServer: reorder wifi services start"
Jeff Sharkey [Fri, 20 Jan 2017 22:50:49 +0000 (22:50 +0000)]
Merge "Add Binder support for Parcelable exceptions."
am:
a2ef6b5741
Change-Id: Ide766c0220e86b7661af83551354b3a498297ed8
Jeff Sharkey [Fri, 20 Jan 2017 22:45:03 +0000 (22:45 +0000)]
Merge "Add Binder support for Parcelable exceptions."
Chad Brubaker [Fri, 20 Jan 2017 22:06:55 +0000 (22:06 +0000)]
Merge "Add ephemeral whitelist for SettingsProvider"
Holly Jiuyu Sun [Thu, 12 Jan 2017 01:34:03 +0000 (17:34 -0800)]
Change the default behavior when MCC/MNC changes.
By default, we don't restart the activity when MCC/MNC changes
even when they are not set in configChanges. If they want to
restart, set mcc or mnc in the new attribute restartOnConfigChanges.
Bug:
34258948
Test: Test in unit test(testGetActivityConfigChanges() in
PackageParserTest.java) and on real device with
changing the SIM card.
Change-Id: Icd6899597c9b8f2e5706e74373a0280d19150092
Todd Kennedy [Fri, 20 Jan 2017 21:50:08 +0000 (13:50 -0800)]
Remove call to propagate permissions
There's a bug and will be fixed in the near future
Test: Manual
Change-Id: I9ef8c4a278acf1131f133431e571d438776ab1e1
Matthew Ng [Thu, 19 Jan 2017 19:04:50 +0000 (11:04 -0800)]
Added open, dismiss and split screen as custom accessibility actions
In overview with talkback, swiping would select the individual apps
instead of the open and dismiss views. The open and dismiss actions
are changed to accessibility custom actions with the additional action
to split the current app into multi-window mode.
Test: manual - used talkback with running all three actions in
landscape and portrait
Fixes:
29360763
Change-Id: Ie0bec99b849c5754d45577c66b17fa6b0c7e985c
TreeHugger Robot [Fri, 20 Jan 2017 21:44:56 +0000 (21:44 +0000)]
Merge "Expose WifiConfiguration#ephemeral is a SystemApi"
TreeHugger Robot [Fri, 20 Jan 2017 21:18:27 +0000 (21:18 +0000)]
Merge "Make TelephonyManager#get/setAllowedCarriers system api"
TreeHugger Robot [Fri, 20 Jan 2017 20:33:21 +0000 (20:33 +0000)]
Merge "Change KernelUidCpuTimeReader Slog.wtf to Slog.e"
Bill Yi [Fri, 20 Jan 2017 19:54:40 +0000 (11:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I735fae714687dd3170f3d33d07fb38e967155338
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 20 Jan 2017 19:45:30 +0000 (19:45 +0000)]
Merge "Destroy DisplayLists on time"
Sundeep Ghuman [Fri, 20 Jan 2017 19:42:00 +0000 (19:42 +0000)]
Merge "Allow REQUEST_NETWORK_SCORES to be used by SetupWizard."
Amin Shaikh [Fri, 20 Jan 2017 19:05:13 +0000 (11:05 -0800)]
Expose WifiConfiguration#ephemeral is a SystemApi
Bug:
34503179
Test: make
Change-Id: I3a89b89da67152bb522ae4dbfd1cfe1b4830d8ae
Philipp Weiß [Fri, 20 Jan 2017 19:25:06 +0000 (19:25 +0000)]
Merge "DO NOT MERGE Finalize device-monitoring dialog strings" into nyc-mr2-dev am:
c281fd12af
am:
fc6771a9a6 -s ours
Change-Id: I69d09880b997dd615faaf18089cfcc8268d68b2a
phweiss [Fri, 20 Jan 2017 19:23:58 +0000 (19:23 +0000)]
DO NOT MERGE Finalize device-monitoring dialog strings am:
232b0d4088
am:
61d7be70e7 -s ours
Change-Id: I28d6bbda7a09cfca1c82cc94eae1f4b496ca8aa5
Philipp Weiß [Fri, 20 Jan 2017 19:18:38 +0000 (19:18 +0000)]
Merge "DO NOT MERGE Finalize device-monitoring dialog strings" into nyc-mr2-dev
am:
c281fd12af
Change-Id: Idb993945120ca591dfa9471bfc4a36706fe70e5f
phweiss [Fri, 20 Jan 2017 19:18:29 +0000 (19:18 +0000)]
DO NOT MERGE Finalize device-monitoring dialog strings
am:
232b0d4088
Change-Id: I37008b2f10b746ed7aa0c455d832efd7b2966c77
Philipp Weiß [Fri, 20 Jan 2017 19:12:44 +0000 (19:12 +0000)]
Merge "DO NOT MERGE Finalize device-monitoring dialog strings" into nyc-mr2-dev
Chad Brubaker [Thu, 5 Jan 2017 23:51:41 +0000 (15:51 -0800)]
Add ephemeral whitelist for SettingsProvider
Currently the list is small, only whats required to launch a basic
ephemeral app. It will expand in followup CLs.
Note that the goal of this is not to completely shut down all ways that
an ephemeral app could learn the value (or part of) of a setting not in
the set. The goal is to limit the raw access to settings to a small set that
includes settings that ephemeral apps should have access to directly
System APIs that are exposed to ephemeral apps may allow for
ephemeral apps to learn the value of settings not in the directly
exposed set and that is OK and _not_ a security issue.
This contains a hack to support code in system system server that in
the process of a binder transaction reads a setting using a
ContentReceiver with a system package name. This was previously not an
issue but causes an exception to be thrown from getCallingPackage which
reading a setting now calls.
Bug:
33349998
Test: Boots, functions as normal for regular apps.
Test: cts-tradefed run cts -m CtsProviderTestCases -t
android.provider.cts.SettingsTest
Change-Id: Icc839b0d98c725d23cdd395e8cb76a7b293f8767
Ta-wei Yen [Fri, 20 Jan 2017 18:45:28 +0000 (18:45 +0000)]
Merge "Add voicemail backup/restore columns" into nyc-mr2-dev am:
c1a1348b99
am:
f1a0d799c4
Change-Id: I0219d934fbae05e06d9187ad9e93529885019fe2
Ta-wei Yen [Fri, 20 Jan 2017 18:44:39 +0000 (18:44 +0000)]
Add voicemail backup/restore columns am:
f48d5ce630
am:
1f296f7793
Change-Id: I38e6e33438500a0815bb1b87dc21617213f42637
Makoto Onuki [Thu, 19 Jan 2017 20:11:11 +0000 (12:11 -0800)]
Do not allow work profile apps to access main profile app.
Bug:
34340531
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Test: cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -m CtsShortcutHostTestCases -t 'android.content.pm.cts.shortcuthost.ShortcutManagerMultiuserTest#testManagedUser'
Test: cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -m CtsDevicePolicyManagerTestCases -t 'com.android.cts.devicepolicy.LauncherAppsProfileTest'
Change-Id: I34e9f351d2a8addf65a5a928c3dd4363f08611dc
Ta-wei Yen [Fri, 20 Jan 2017 18:38:31 +0000 (18:38 +0000)]
Merge "Add voicemail backup/restore columns" into nyc-mr2-dev
am:
c1a1348b99
Change-Id: Ifd5116c2d8e44d6f16d6abd76d41fe5aebb28a24
Ta-wei Yen [Fri, 20 Jan 2017 18:38:23 +0000 (18:38 +0000)]
Add voicemail backup/restore columns
am:
f48d5ce630
Change-Id: I2dd76b4107b9e7c75595fa3c49dcda74cebd2a09
Sundeep Ghuman [Fri, 20 Jan 2017 18:32:18 +0000 (10:32 -0800)]
Allow REQUEST_NETWORK_SCORES to be used by SetupWizard.
Bug:
34479801
Test: Built system and setup wizard and tested.
Change-Id: I4fcc3d1f56f78cfb0deaf13d0eccae97dac4ffa2
phweiss [Fri, 20 Jan 2017 17:41:57 +0000 (18:41 +0100)]
DO NOT MERGE Finalize device-monitoring dialog strings
Add Char-limits, do minor style changes and remove STOPSHIP comment.
Related change on master:
ag/
1800040
0d08ca7d7fa12217f4a6562764b4ea65f3fa31f2
BUG:
33655277
BUG:
31207965
BUG:
29748723
Test: only string changes
Change-Id: I37d1b509c6344d7f7d144fc0d8950f45faeaaef4
Ta-wei Yen [Fri, 20 Jan 2017 18:31:41 +0000 (18:31 +0000)]
Merge "Add voicemail backup/restore columns" into nyc-mr2-dev
Fyodor Kupolov [Fri, 20 Jan 2017 18:28:15 +0000 (18:28 +0000)]
Merge "[DO NOT MERGE] Do not report boot timings on first boot or runtime restart" into nyc-mr2-dev am:
1dcfc423cd
am:
750d641ac1 -s ours
Change-Id: I4264b0c19ad42204e81342eb12aed5dbd03fdefc
Fyodor Kupolov [Fri, 20 Jan 2017 18:27:15 +0000 (18:27 +0000)]
[DO NOT MERGE] Do not report boot timings on first boot or runtime restart am:
83a218c416
am:
155e452f25 -s ours
Change-Id: Ibc7e072662aca3a346326ee232305f2231785ce4
Fyodor Kupolov [Fri, 20 Jan 2017 18:23:20 +0000 (18:23 +0000)]
Merge "[DO NOT MERGE] Do not report boot timings on first boot or runtime restart" into nyc-mr2-dev
am:
1dcfc423cd
Change-Id: I00117f3c0ac6d9bae5650dceea182790ed43bb1c
Fyodor Kupolov [Fri, 20 Jan 2017 18:23:16 +0000 (18:23 +0000)]
[DO NOT MERGE] Do not report boot timings on first boot or runtime restart
am:
83a218c416
Change-Id: Ib503ffb8d0d718aa6af4b420cc71e32a033e658b
Fyodor Kupolov [Fri, 20 Jan 2017 18:17:58 +0000 (18:17 +0000)]
Merge "[DO NOT MERGE] Do not report boot timings on first boot or runtime restart" into nyc-mr2-dev
Bartosz Fabianowski [Fri, 20 Jan 2017 18:15:56 +0000 (18:15 +0000)]
Merge "Allow system to retrieve persistent preferred activities"
Crystal Qin [Fri, 20 Jan 2017 18:13:41 +0000 (18:13 +0000)]
Merge "Add new key purpose Wrap Key to KeyProperties.java and KeymasterDefs.java."
TreeHugger Robot [Fri, 20 Jan 2017 18:08:48 +0000 (18:08 +0000)]
Merge "Visual refresh for QS"
TreeHugger Robot [Fri, 20 Jan 2017 18:05:58 +0000 (18:05 +0000)]
Merge "Don't set a task description for work lock overlay"
John Reck [Fri, 20 Jan 2017 03:54:18 +0000 (19:54 -0800)]
Destroy DisplayLists on time
Change-Id: I32a97d1234545075e9423c352c772e09ca954741
Fixes:
34072929
Test: Manual, see b/
34072929#comment36
Amin Shaikh [Fri, 20 Jan 2017 01:24:41 +0000 (17:24 -0800)]
Add additional fields to RecommendationRequest.
- Add networkId and timestamp for the last user selected network
Bug:
34467596
Test: runtest --path core/tests/coretests/src/android/net/RecommendationRequestTest.java
Change-Id: Ic81c1beede1a643cd428b6e5c57ed430a6b1ccc0
Merged-In: Ic81c1beede1a643cd428b6e5c57ed430a6b1ccc0
Fyodor Kupolov [Thu, 19 Jan 2017 20:11:32 +0000 (12:11 -0800)]
[DO NOT MERGE] Do not report boot timings on first boot or runtime restart
During first boot after OTA, additional dexopting has to be done
during PM initialization. Timings for OTA are reported separately,
so we should ignore first boot to avoid skewing the metrics.
The following metrics were updated:
- framework_locked_boot_completed
- framework_boot_completed
Cherry-picked from commit
1d87e40d4214a7f6d20a58d6f27cca174f0d974e
Test: manual
Bug:
32807863
Change-Id: I9d545cf38118f45f3f13597df2949d0ae4abd26a
Jeff Sharkey [Fri, 20 Jan 2017 17:31:55 +0000 (17:31 +0000)]
Merge "StrictMode to detect untagged network traffic."
TreeHugger Robot [Fri, 20 Jan 2017 17:29:58 +0000 (17:29 +0000)]
Merge "Add additional fields to RecommendationRequest."
Philipp Weiß [Fri, 20 Jan 2017 17:29:49 +0000 (17:29 +0000)]
Merge "Adjust device-monitoring dialog strings"
TreeHugger Robot [Fri, 20 Jan 2017 17:20:03 +0000 (17:20 +0000)]
Merge "Change default settings theme to light color."
Michal Karpinski [Fri, 20 Jan 2017 17:12:18 +0000 (17:12 +0000)]
Merge "Unhide enabling backup service in DO APIs"
Makoto Onuki [Fri, 20 Jan 2017 16:49:12 +0000 (16:49 +0000)]
Merge "requestPinShortcut for pinned shortcut still notifies launcher"
Jason Monk [Wed, 18 Jan 2017 14:17:13 +0000 (09:17 -0500)]
Visual refresh for QS
Adds circles and things
Test: visual
Change-Id: I7d974fcfe6257357abfd1a7d0ee521f0e6cee588
phweiss [Fri, 20 Jan 2017 15:33:12 +0000 (16:33 +0100)]
Adjust device-monitoring dialog strings
Add Char-limits and do minor style changes.
BUG:
33655277
BUG:
31207965
BUG:
29748723
Test: only string changes
Change-Id: I2b3187ad4a466b7c08f6ee865cb20e0cca492ff6
TreeHugger Robot [Fri, 20 Jan 2017 14:31:36 +0000 (14:31 +0000)]
Merge "Refactor GLFunctorDrawable to use new SkCanvas API for clip region"
Julia Reynolds [Fri, 20 Jan 2017 14:30:15 +0000 (14:30 +0000)]
Merge "Save deleted channels."
TreeHugger Robot [Fri, 20 Jan 2017 13:32:01 +0000 (13:32 +0000)]
Merge "Prepare for removal of legacy-test from default targets"
TreeHugger Robot [Fri, 20 Jan 2017 12:08:14 +0000 (12:08 +0000)]
Merge "Adding app op and intent action for external sources"
Jorim Jaggi [Fri, 20 Jan 2017 11:46:09 +0000 (11:46 +0000)]
Merge "Persist task snapshots to disk"
Suprabh Shukla [Fri, 16 Dec 2016 22:47:25 +0000 (14:47 -0800)]
Adding app op and intent action for external sources
Added an app op to control which package and uid can install apps on the
device and an intent action to launch the settings fragment.
Test: Will include in follow up CL, tracked in b/
33792674
Bug:
31002700
Change-Id: Ic073495759d9867f8001a6c712e402398c53dfc9
Erik Kline [Fri, 20 Jan 2017 10:25:22 +0000 (10:25 +0000)]
Merge "Refactor to SimChangeListener class" am:
a12217012e am:
74247b4ee8 am:
6dacd5ecf2
am:
dc81bd74ae
Change-Id: Ifa36726ce67fd81ca508d5530b815f5e82557a89
Erik Kline [Fri, 20 Jan 2017 10:21:20 +0000 (10:21 +0000)]
Merge "Refactor to SimChangeListener class" am:
a12217012e am:
74247b4ee8
am:
6dacd5ecf2
Change-Id: Ia80e64c9f1188953aa4d9687bc7b0b0659de968a
Erik Kline [Fri, 20 Jan 2017 10:18:52 +0000 (10:18 +0000)]
Merge "Address comments from previous change (320592)" am:
e7cb6c3761 am:
b6f606b59f am:
454a408717
am:
430b1ff0f0
Change-Id: I488ec47172c48f2965b33fc484a26f395aa48a29
Erik Kline [Fri, 20 Jan 2017 10:16:56 +0000 (10:16 +0000)]
Merge "Refactor to SimChangeListener class" am:
a12217012e
am:
74247b4ee8
Change-Id: I59dc854bd74eb8ba6addae90a4a87453868b5368
Erik Kline [Fri, 20 Jan 2017 10:14:50 +0000 (10:14 +0000)]
Merge "Address comments from previous change (320592)" am:
e7cb6c3761 am:
b6f606b59f
am:
454a408717
Change-Id: I374c8c63e4fb3310c3c50cc531a65005991c2fe2
Erik Kline [Fri, 20 Jan 2017 10:13:08 +0000 (10:13 +0000)]
Merge "Refactor to SimChangeListener class"
am:
a12217012e
Change-Id: I863f0b23251a0ebd18a76cf08e1ff0f2cee9cda3
Erik Kline [Fri, 20 Jan 2017 10:10:52 +0000 (10:10 +0000)]
Merge "Address comments from previous change (320592)" am:
e7cb6c3761
am:
b6f606b59f
Change-Id: Icc5aa3d6cafd9829e65a0e82523727a9aba4ade5
Treehugger Robot [Fri, 20 Jan 2017 10:05:50 +0000 (10:05 +0000)]
Merge "Refactor to SimChangeListener class"
Erik Kline [Fri, 20 Jan 2017 10:04:51 +0000 (10:04 +0000)]
Merge "Address comments from previous change (320592)"
am:
e7cb6c3761
Change-Id: I3266a02a4a2fd76c4bb2f1a744103add63307e26
Treehugger Robot [Fri, 20 Jan 2017 09:57:26 +0000 (09:57 +0000)]
Merge "Address comments from previous change (320592)"
TreeHugger Robot [Fri, 20 Jan 2017 09:43:15 +0000 (09:43 +0000)]
Merge "ConnectivityServiceTest: some fixes in CallbackInfo"
Lorenzo Colitti [Fri, 20 Jan 2017 09:06:55 +0000 (09:06 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options." am:
e7128b10a8 am:
113d5f8f40 am:
6bcbb16630
am:
f73df6370a
Change-Id: I4ca872c2e38f9513d0f5cb883a535f96a77afc76
Lorenzo Colitti [Fri, 20 Jan 2017 09:02:50 +0000 (09:02 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options." am:
e7128b10a8 am:
113d5f8f40
am:
6bcbb16630
Change-Id: I38ba45068c00c0948f561a788a7015ed250d62b6
Paul Duffin [Thu, 19 Jan 2017 16:47:45 +0000 (16:47 +0000)]
Prepare for removal of legacy-test from default targets
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.
Bug:
30188076
Test: make checkbuild
Change-Id: If507b641624a2933e722f61e815890fcdf442265
Lorenzo Colitti [Fri, 20 Jan 2017 08:58:47 +0000 (08:58 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options." am:
e7128b10a8
am:
113d5f8f40
Change-Id: Ic2d6596d14f6176a823fd66b400af8515617c66d
Lorenzo Colitti [Fri, 20 Jan 2017 08:54:42 +0000 (08:54 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options."
am:
e7128b10a8
Change-Id: If2260dd2b1bdaf2619cee668f8c2ef81e9dcfdce
Treehugger Robot [Fri, 20 Jan 2017 08:47:17 +0000 (08:47 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options."