OSDN Git Service

android-x86/frameworks-base.git
6 years agoSwitch to a fancy new queue
John Reck [Mon, 23 Oct 2017 20:10:41 +0000 (13:10 -0700)]
Switch to a fancy new queue

Test: unit tests & benchmarks pass/faster

Change-Id: I9521432172d6dd6039c5280b1265479a36a86247

6 years agoMerge "Only log a warning if it's an actual violation"
Fyodor Kupolov [Thu, 26 Oct 2017 23:02:07 +0000 (23:02 +0000)]
Merge "Only log a warning if it's an actual violation"

6 years agoMerge "Formalize recents component in the system"
Winson Chung [Thu, 26 Oct 2017 21:04:06 +0000 (21:04 +0000)]
Merge "Formalize recents component in the system"

6 years agoMerge "5/Organize and make running tasks code more efficient"
Winson Chung [Thu, 26 Oct 2017 21:03:06 +0000 (21:03 +0000)]
Merge "5/Organize and make running tasks code more efficient"

6 years agoMerge "Revert "[WebView] Clean up code for finding paths and sizes of native libs""
Salvador Martinez [Thu, 26 Oct 2017 20:33:51 +0000 (20:33 +0000)]
Merge "Revert "[WebView] Clean up code for finding paths and sizes of native libs""

6 years agoRevert "[WebView] Clean up code for finding paths and sizes of native libs"
Salvador Martinez [Thu, 26 Oct 2017 20:25:57 +0000 (20:25 +0000)]
Revert "[WebView] Clean up code for finding paths and sizes of native libs"

This reverts commit dec7d6032523853d7aa47e7ca7d96f781d51bcad.

Change-Id: Ifc8e0c23e554f69abd18c01df95e56ab7dd55aec

6 years agoMerge "WebView: change 'iff' to 'if' in docs"
TreeHugger Robot [Thu, 26 Oct 2017 20:17:14 +0000 (20:17 +0000)]
Merge "WebView: change 'iff' to 'if' in docs"

6 years agoMerge "Minor fixes on SaveInfo javadoc."
TreeHugger Robot [Thu, 26 Oct 2017 20:05:16 +0000 (20:05 +0000)]
Merge "Minor fixes on SaveInfo javadoc."

6 years agoMerge "Add trim levels to writeToProto"
TreeHugger Robot [Thu, 26 Oct 2017 19:55:10 +0000 (19:55 +0000)]
Merge "Add trim levels to writeToProto"

6 years agoMerge "[WebView] Clean up code for finding paths and sizes of native libs"
TreeHugger Robot [Thu, 26 Oct 2017 19:47:17 +0000 (19:47 +0000)]
Merge "[WebView] Clean up code for finding paths and sizes of native libs"

6 years agoMerge "Don't notify isolated processes about proxy updates."
TreeHugger Robot [Thu, 26 Oct 2017 19:26:28 +0000 (19:26 +0000)]
Merge "Don't notify isolated processes about proxy updates."

6 years agoMerge "Updating some PowerManagerService proto messages."
TreeHugger Robot [Thu, 26 Oct 2017 18:26:37 +0000 (18:26 +0000)]
Merge "Updating some PowerManagerService proto messages."

6 years agoFormalize recents component in the system
Winson Chung [Wed, 25 Oct 2017 17:19:05 +0000 (10:19 -0700)]
Formalize recents component in the system

- Add resource for recents component which can be overridden in an overlay
- Allow the static recents component access to APIs which would otherwise
  require privileged permissions
- Remove some unused TV recents code

Bug: 67864419
Test: com.android.server.am.RecentTasksTest
Test: #testNotRecentsComponent_denyApiAccess
Test: #testRecentsComponent_allowApiAccessWithoutPermissions

Change-Id: Ia4939b7d443a6058ab4bb41d8c194eb4611cbf80

6 years ago5/Organize and make running tasks code more efficient
Winson Chung [Wed, 11 Oct 2017 17:39:32 +0000 (10:39 -0700)]
5/Organize and make running tasks code more efficient

- Move running task code from stack/supervisor into its own class
- Reduce work to calculate running tasks. Instead of creating RunningTaskInfo
  for every single task and then limiting to the requested set, calculate
  the set and then create the infos.
- Consolidate calculation of number of running activities in a task between
  the RecentTaskInfo and the RunningTaskInfo
- Remove unused flag argument, adding another method to instead filter the
  collection of running tasks to exclude certain activity types and windowing
  modes.  This allows us to fetch only the last running task in SystemUI and
  not have additional logic on our side.

Bug: 34270611
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/am/RunningTasksTest.java
Change-Id: Iaba7487cea0545f69739da7cd3095b500a0df6fc

6 years agoMerge "Add metricsEvent for WifiCallingSettingsForSub fragment."
Xiangyu/Malcolm Chen [Thu, 26 Oct 2017 17:59:33 +0000 (17:59 +0000)]
Merge "Add metricsEvent for WifiCallingSettingsForSub fragment."

6 years agoMerge "Don't blindly reference package object"
TreeHugger Robot [Thu, 26 Oct 2017 17:46:50 +0000 (17:46 +0000)]
Merge "Don't blindly reference package object"

6 years agoWebView: change 'iff' to 'if' in docs
Nate Fischer [Thu, 26 Oct 2017 17:43:00 +0000 (10:43 -0700)]
WebView: change 'iff' to 'if' in docs

Docs change only, no change to logic.

This replaces "iff" (if and only if) with "if". The former term is
unclear, and there's no real benefit to expanding to "if and only if."

Change-Id: I1ac26e24b816f784b6868c8860849d4118b33294
Fixes: 68133964
Test: make -j40 docs (manually verify the change looks good)

6 years agoMerge "Move violation extra messages into throwable"
TreeHugger Robot [Thu, 26 Oct 2017 17:30:26 +0000 (17:30 +0000)]
Merge "Move violation extra messages into throwable"

6 years agoDon't notify isolated processes about proxy updates.
Torne (Richard Coles) [Tue, 12 Sep 2017 22:12:41 +0000 (18:12 -0400)]
Don't notify isolated processes about proxy updates.

ConnectivityManager is not accessible from isolated processes, so
notifying them causes exception logspam. Since they don't have network
privileges anyway, just don't notify them about proxy changes.

Change-Id: Ic7280df84d7f54433a03e10e998e90d48da0f562
Fixes: 64640552
Test: set proxy on wifi network, disable wifi, launch webview app, enable wifi

6 years agoMinor fixes on SaveInfo javadoc.
Felipe Leme [Thu, 26 Oct 2017 16:23:43 +0000 (09:23 -0700)]
Minor fixes on SaveInfo javadoc.

Test: ran 'mmm -j108 frameworks/base/:doc-comment-check-docs' and checked HTML

Change-Id: I9ba776be77132942d516d23ac69d3ad9f9b3da62

6 years agoAdd trim levels to writeToProto
Adrian Roos [Thu, 28 Sep 2017 14:54:06 +0000 (16:54 +0200)]
Add trim levels to writeToProto

Enables faster dumping without information that is not relevant in
certain scenarios.

Bug: 64831661
Test: adb shell dumpsys window --proto | hexdump -C
Change-Id: I10827f2dd092fb53b2d452bb12ef76a6adb50f41

6 years agoDon't blindly reference package object
Todd Kennedy [Thu, 26 Oct 2017 15:45:21 +0000 (08:45 -0700)]
Don't blindly reference package object

This is a workaround for the bug that prevents the device from
booting. Will keep the bug open to address the core issue.

Also added some debug logs to try to catch this in the wild.

Bug: 68260103
Test: Manual. Device boots.
Change-Id: Ifed80c74897cc54eff2ee73df6dcc3b1e6f79170

6 years agoMerge "Cleanup activity and task creation in unit tests."
Bryce Lee [Thu, 26 Oct 2017 14:29:07 +0000 (14:29 +0000)]
Merge "Cleanup activity and task creation in unit tests."

6 years ago[WebView] Clean up code for finding paths and sizes of native libs
Gustav Sennton [Mon, 18 Sep 2017 19:52:43 +0000 (20:52 +0100)]
[WebView] Clean up code for finding paths and sizes of native libs

Now that we no longer pass the paths of the native WebView libraries to
the native loading code we can simplify the code for fetching the path
and the size of the native WebView library.

Also add automated tests (WebViewLoadingTests) for loading native
libraries from test APKs where the libraries are stored either on disk
or as uncompressed libraries in the APKs.

Bug: 28736099
Test: start WebView-app, and ensure that the relro file is loaded into
the app process. Do this for both 32-, and 64-bit apps. And both for a
WebView APK where the libraries are loaded onto disk, and an APK where
the libraries are loaded uncompressed from the APK.
Test: make WebViewLoadingTests && make tradefed-all && \
tradefed.sh run template/local_min --template:map test=WebViewLoadingTests
Change-Id: I00d9b7f0650fe440ebee971eed8482759c7cbc79

6 years agoMerge "Don't overly call transport.transportDirName()"
TreeHugger Robot [Thu, 26 Oct 2017 10:14:39 +0000 (10:14 +0000)]
Merge "Don't overly call transport.transportDirName()"

6 years agoMerge "Clarifying GnssClock field"
TreeHugger Robot [Thu, 26 Oct 2017 07:43:32 +0000 (07:43 +0000)]
Merge "Clarifying GnssClock field"

6 years agoMerge "Fix a minor typo."
TreeHugger Robot [Thu, 26 Oct 2017 07:06:16 +0000 (07:06 +0000)]
Merge "Fix a minor typo."

6 years agoMerge changes I59b6e04f,I55694d89 am: 9009eabbfe am: 93134fea64
Hugo Benichi [Thu, 26 Oct 2017 06:34:27 +0000 (06:34 +0000)]
Merge changes I59b6e04f,I55694d89 am: 9009eabbfe am: 93134fea64
am: 597757b8ab

Change-Id: I61f321ebd67432e02b5621fa1c662953295999fd

6 years agoMerge changes I59b6e04f,I55694d89 am: 9009eabbfe
Hugo Benichi [Thu, 26 Oct 2017 06:23:31 +0000 (06:23 +0000)]
Merge changes I59b6e04f,I55694d89 am: 9009eabbfe
am: 93134fea64

Change-Id: I923fe9cc37463e695182c7a279d201ba7e9d6518

6 years agoMerge changes I59b6e04f,I55694d89
Hugo Benichi [Thu, 26 Oct 2017 06:13:39 +0000 (06:13 +0000)]
Merge changes I59b6e04f,I55694d89
am: 9009eabbfe

Change-Id: I217e32a7ab25fd73f3361015efae9bbbd1fde0f4

6 years agoMerge changes I59b6e04f,I55694d89
Hugo Benichi [Thu, 26 Oct 2017 06:01:06 +0000 (06:01 +0000)]
Merge changes I59b6e04f,I55694d89

* changes:
  Remove Parcelable interface from DefaultNetworkEvent
  Extract logging of default network events

6 years agoFix a minor typo.
Donald Chai [Thu, 26 Oct 2017 04:50:40 +0000 (21:50 -0700)]
Fix a minor typo.

Test: N/A
Change-Id: I56d76640c8a06f524b829fa316612954b43809ff

6 years agoMerge "Fix NPE"
TreeHugger Robot [Thu, 26 Oct 2017 02:36:46 +0000 (02:36 +0000)]
Merge "Fix NPE"

6 years agoMerge "Fixed an issue where the falsing classifier wasn't used"
TreeHugger Robot [Thu, 26 Oct 2017 02:35:06 +0000 (02:35 +0000)]
Merge "Fixed an issue where the falsing classifier wasn't used"

6 years agoMerge "HwBinder: Clean up code, add logging" am: 28ed91161d am: 09cd361d2d
Andreas Gampe [Thu, 26 Oct 2017 02:26:26 +0000 (02:26 +0000)]
Merge "HwBinder: Clean up code, add logging" am: 28ed91161d am: 09cd361d2d
am: 7990e6b0eb

Change-Id: I36c4e54bc3522ba3b91e8cdf846429e247bd5ba5

6 years agoMerge "HwBinder: Clean up code, add logging" am: 28ed91161d
Andreas Gampe [Thu, 26 Oct 2017 02:14:56 +0000 (02:14 +0000)]
Merge "HwBinder: Clean up code, add logging" am: 28ed91161d
am: 09cd361d2d

Change-Id: I02c31f8ac340c241fbf9b0ffc07c126c8812fb34

6 years agoMerge "HwBinder: Clean up code, add logging"
Andreas Gampe [Thu, 26 Oct 2017 02:03:47 +0000 (02:03 +0000)]
Merge "HwBinder: Clean up code, add logging"
am: 28ed91161d

Change-Id: Ie7d511812c6dc419ca793c28a4cee1150a90bd66

6 years agoMerge "HwBinder: Clean up code, add logging"
Treehugger Robot [Thu, 26 Oct 2017 01:52:40 +0000 (01:52 +0000)]
Merge "HwBinder: Clean up code, add logging"

6 years agoUpdating some PowerManagerService proto messages.
Kweku Adams [Wed, 25 Oct 2017 22:12:34 +0000 (15:12 -0700)]
Updating some PowerManagerService proto messages.

Added some extra comments.

Bug: 65750826
Test: it builds
Change-Id: I0469b636376628bb53a3d549367528b573a957c4

6 years agoMerge "Convert framework-protos to Android.bp" am: d4609af986 am: d78b46eb63
Colin Cross [Thu, 26 Oct 2017 01:42:45 +0000 (01:42 +0000)]
Merge "Convert framework-protos to Android.bp" am: d4609af986 am: d78b46eb63
am: 5fec62ceb7

Change-Id: Ice5e7dfcf2ac8d58cde7cc5691271e318a45582d

6 years agoMerge "incidentd: Updating PowerManagerService proto files."
TreeHugger Robot [Thu, 26 Oct 2017 01:30:29 +0000 (01:30 +0000)]
Merge "incidentd: Updating PowerManagerService proto files."

6 years agoMerge "Convert framework-protos to Android.bp" am: d4609af986
Colin Cross [Thu, 26 Oct 2017 01:25:56 +0000 (01:25 +0000)]
Merge "Convert framework-protos to Android.bp" am: d4609af986
am: d78b46eb63

Change-Id: I8721f2f3182c0d5a7b1717bde0c840c7e1864a41

6 years agoMerge "Move drag and drop related lines to DragDropController"
TreeHugger Robot [Thu, 26 Oct 2017 01:13:59 +0000 (01:13 +0000)]
Merge "Move drag and drop related lines to DragDropController"

6 years agoMerge "Convert framework-protos to Android.bp"
Colin Cross [Thu, 26 Oct 2017 01:11:13 +0000 (01:11 +0000)]
Merge "Convert framework-protos to Android.bp"
am: d4609af986

Change-Id: I6ebf88a0931b7f9f49ac8044deb46b100129bb9f

6 years agoMerge "Convert framework-protos to Android.bp"
Colin Cross [Thu, 26 Oct 2017 01:01:08 +0000 (01:01 +0000)]
Merge "Convert framework-protos to Android.bp"

6 years agoMerge "Fix issue #64224738: Document return value of IBinder.transact()" am: ceb336fc...
Hans Boehm [Thu, 26 Oct 2017 00:34:23 +0000 (00:34 +0000)]
Merge "Fix issue #64224738: Document return value of IBinder.transact()" am: ceb336fc8a am: 05c93f1793  -s ours
am: 08cdf440c0  -s ours

Change-Id: I26d53b894cad3b746ca8bf651845a718413f321a

6 years agoMerge "Fix issue #64224738: Document return value of IBinder.transact()" am: ceb336fc8a
Hans Boehm [Thu, 26 Oct 2017 00:23:15 +0000 (00:23 +0000)]
Merge "Fix issue #64224738: Document return value of IBinder.transact()" am: ceb336fc8a
am: 05c93f1793  -s ours

Change-Id: I2a3e9b0a1a2e331fd0fa3063597fa450b624a473

6 years agoMerge "Fixed issue with MAX_RUNNING_USERS"
Fyodor Kupolov [Thu, 26 Oct 2017 00:15:50 +0000 (00:15 +0000)]
Merge "Fixed issue with MAX_RUNNING_USERS"

6 years agoMove violation extra messages into throwable
Kurt Nelson [Wed, 25 Oct 2017 20:38:06 +0000 (13:38 -0700)]
Move violation extra messages into throwable

Some violations have a separate string from the throwable. Prepending
the string to the throwable's message or using it as the message sets us
up for all violations to extend Throwable.

Bug: 62458734
Test: cts-tradefed run cts-dev --module CtsOsTestCases --test
android.os.cts.StrictModeTest
Change-Id: I6a97ee69a90fb975dc453ca37fe53ea78ebfe974

6 years agoMerge "Fix issue #64224738: Document return value of IBinder.transact()"
Hans Boehm [Thu, 26 Oct 2017 00:12:52 +0000 (00:12 +0000)]
Merge "Fix issue #64224738: Document return value of IBinder.transact()"
am: ceb336fc8a

Change-Id: Ibcd3386a93a3bb5de8fb84a178678dab67beb464

6 years agoMerge "Use annotation instead of comment"
Kurt Nelson [Thu, 26 Oct 2017 00:09:12 +0000 (00:09 +0000)]
Merge "Use annotation instead of comment"

6 years agoOnly log a warning if it's an actual violation
Fyodor Kupolov [Thu, 26 Oct 2017 00:03:50 +0000 (17:03 -0700)]
Only log a warning if it's an actual violation

Otherwise the message can be confusing if deny-permission is used or
app is updated.

Test: manual
Bug: 64693550
Change-Id: I19943d8cbd13a5173356a32565db88856428009e

6 years agoMerge "Fix issue #64224738: Document return value of IBinder.transact()"
Hans Boehm [Thu, 26 Oct 2017 00:01:12 +0000 (00:01 +0000)]
Merge "Fix issue #64224738: Document return value of IBinder.transact()"

6 years agoMerge "Remove scheduling animation which is no longer needed"
TreeHugger Robot [Wed, 25 Oct 2017 23:47:28 +0000 (23:47 +0000)]
Merge "Remove scheduling animation which is no longer needed"

6 years agoFix NPE
Todd Kennedy [Wed, 25 Oct 2017 22:51:36 +0000 (15:51 -0700)]
Fix NPE

Accidentally removed a check for whether or not the disabled
package setting was null

Bug: 68260103
Test: Manual
Change-Id: I6a634f2292948283153659eb4ef64524cbf53a78

6 years agoMerge "android.os.HwBinder: fix native static method signature" am: 65944e79b2 am...
Yifan Hong [Wed, 25 Oct 2017 22:50:57 +0000 (22:50 +0000)]
Merge "android.os.HwBinder: fix native static method signature" am: 65944e79b2 am: 21347cf052
am: 7f73cb73d2

Change-Id: I9ed7d60a00c80649de49a1b2359bf7a885d2dd0f

6 years agoCleanup activity and task creation in unit tests.
Bryce Lee [Wed, 25 Oct 2017 17:22:19 +0000 (10:22 -0700)]
Cleanup activity and task creation in unit tests.

This changelist replaces static methods used to create activity and
tasks with builders so that they can be extended in the future. This
change also removes the static default component names.

Bug: 64750076
Test: bit FrameworksServicesTests:com.android.server.am.ActivityRecordTests
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStackSupervisorTests
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStackTests
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStarterTests
Test: bit FrameworksServicesTests:com.android.server.am.LaunchBoundsTests
Test: bit FrameworksServicesTests:com.android.server.am.LaunchingActivityPositionerTests
Test: bit FrameworksServicesTests:com.android.server.am.LaunchingTaskPositionerTests
Test: bit FrameworksServicesTests:com.android.server.am.LaunchingBoundsControllerTests
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java
Change-Id: I389536b1dd618d4f80b5073ded7aeaacbab39cac

6 years agoMerge "android.os.HwBinder: fix native static method signature" am: 65944e79b2
Yifan Hong [Wed, 25 Oct 2017 22:39:22 +0000 (22:39 +0000)]
Merge "android.os.HwBinder: fix native static method signature" am: 65944e79b2
am: 21347cf052

Change-Id: I6ee75f8c697a46105a30d68a8ad79f00f543f9ac

6 years agoMerge "android.os.HwBinder: fix native static method signature"
Yifan Hong [Wed, 25 Oct 2017 22:29:45 +0000 (22:29 +0000)]
Merge "android.os.HwBinder: fix native static method signature"
am: 65944e79b2

Change-Id: I09295da4a6021bd02c5c5e89d1d4ce3a8be82c96

6 years agoAdd metricsEvent for WifiCallingSettingsForSub fragment.
Malcolm Chen [Thu, 19 Oct 2017 20:54:07 +0000 (13:54 -0700)]
Add metricsEvent for WifiCallingSettingsForSub fragment.

Bug: 65648147
Test: Manual

Change-Id: I2447a809e5ab619cac30fc56ed38f8fb3853b317

6 years agoMerge "android.os.HwBinder: fix native static method signature"
Treehugger Robot [Wed, 25 Oct 2017 22:08:36 +0000 (22:08 +0000)]
Merge "android.os.HwBinder: fix native static method signature"

6 years agoHwBinder: Clean up code, add logging
Andreas Gampe [Wed, 25 Oct 2017 20:03:24 +0000 (13:03 -0700)]
HwBinder: Clean up code, add logging

Used ScopedUtfChars to handle lifetime, and correctly throw NPE. It
is illegal to call JNI String functions with a null argument.

Output the service name when starting a thread pool to aid debugging.

Bug: 68217725
Test: m
Test: Device boots
Change-Id: Ie40d3e77a63918330ef1a8a9e0c294f2c451a52a

6 years agoincidentd: Updating PowerManagerService proto files.
Kweku Adams [Mon, 23 Oct 2017 23:46:45 +0000 (16:46 -0700)]
incidentd: Updating PowerManagerService proto files.

Moving to the proto/.../server directory since PowerManagerService is in
com.android.server.
Extracting enums from other components into their own files.

Bug: 65750826
Bug: 65750806
Test: flash device and check incident.proto output
Change-Id: Ib91b7c08142fa66adf18b6e85106d4cbb5adf660

6 years agoFixed issue with MAX_RUNNING_USERS
Fyodor Kupolov [Wed, 25 Oct 2017 21:23:43 +0000 (14:23 -0700)]
Fixed issue with MAX_RUNNING_USERS

Previously the user being switched could remain running if primary user
had work profile, due to counter being decremented twice.

Test: manual switch with work profiles and without + cts
Bug: 67091825
Change-Id: I61212c6407fecefa0094c6265dee6f3184d95701

6 years agoFix issue #64224738: Document return value of IBinder.transact()
Dianne Hackborn [Tue, 1 Aug 2017 00:38:53 +0000 (17:38 -0700)]
Fix issue #64224738: Document return value of IBinder.transact()

Also add appropriate @NonNull and @Nullable annotations.

Test: built

Change-Id: I22de48105ef685baf594cfc004dd3e27e2ba09e9
Merged-In: I22de48105ef685baf594cfc004dd3e27e2ba09e9
(cherry picked from commit 4cd650c0085e6dd20d3f46c5b668e54537f887cf)

6 years agoClarifying GnssClock field
Wyatt Riley [Mon, 23 Oct 2017 21:44:41 +0000 (14:44 -0700)]
Clarifying GnssClock field

Based on partner feedback

Test: Doc only - build-check
Change-Id: I30ba539f5baad69aeb6973167067265b22964cc4

6 years agoMerge "Fix dial emergency call redial issue by China Unicom." am: 3ab81b9694 am:...
Brad Ebinger [Wed, 25 Oct 2017 21:13:13 +0000 (21:13 +0000)]
Merge "Fix dial emergency call redial issue by China Unicom." am: 3ab81b9694 am: 136c475d20
am: a2e4e1530e

Change-Id: Ie77c5dcb32f501bf72fafbd4835ad18ab35841f3

6 years agoMerge "Fix dial emergency call redial issue by China Unicom." am: 3ab81b9694
Brad Ebinger [Wed, 25 Oct 2017 21:00:36 +0000 (21:00 +0000)]
Merge "Fix dial emergency call redial issue by China Unicom." am: 3ab81b9694
am: 136c475d20

Change-Id: If5700f3ffe35e898b47a8e9a9b7886f68dc7eeb8

6 years agoMerge "Start removing remaining pm code to package manager"
TreeHugger Robot [Wed, 25 Oct 2017 20:58:52 +0000 (20:58 +0000)]
Merge "Start removing remaining pm code to package manager"

6 years agoUse annotation instead of comment
Kurt Nelson [Wed, 25 Oct 2017 20:49:26 +0000 (13:49 -0700)]
Use annotation instead of comment

Test: none
Bug: none
Change-Id: I723fba865116a203147dd5f2a6343b2cb29c65a2

6 years agoMerge "Fix dial emergency call redial issue by China Unicom."
Brad Ebinger [Wed, 25 Oct 2017 20:50:54 +0000 (20:50 +0000)]
Merge "Fix dial emergency call redial issue by China Unicom."
am: 3ab81b9694

Change-Id: I3895caab83c75a8f0d0251da6154d5a93fe09694

6 years agoMerge "Move grantPermission to permission manager"
TreeHugger Robot [Wed, 25 Oct 2017 20:44:24 +0000 (20:44 +0000)]
Merge "Move grantPermission to permission manager"

6 years agoMerge "DO NOT MERGE - Support native and srgb for night display" into oc-mr1-dev...
Christine Franks [Wed, 25 Oct 2017 20:38:31 +0000 (20:38 +0000)]
Merge "DO NOT MERGE - Support native and srgb for night display" into oc-mr1-dev am: 2d110e6829
am: 10e9bc5ba7  -s ours

Change-Id: I31976f43ee46c37abc63d1680fea21e54329c785

6 years agoMerge "Fix dial emergency call redial issue by China Unicom."
Brad Ebinger [Wed, 25 Oct 2017 20:36:17 +0000 (20:36 +0000)]
Merge "Fix dial emergency call redial issue by China Unicom."

6 years agoMerge "DO NOT MERGE - Support native and srgb for night display" into oc-mr1-dev
Christine Franks [Wed, 25 Oct 2017 20:28:07 +0000 (20:28 +0000)]
Merge "DO NOT MERGE - Support native and srgb for night display" into oc-mr1-dev
am: 2d110e6829

Change-Id: I0e805b480a3317548c219eb282fcf399b41b4ff1

6 years agoandroid.os.HwBinder: fix native static method signature
Yifan Hong [Wed, 25 Oct 2017 20:19:22 +0000 (13:19 -0700)]
android.os.HwBinder: fix native static method signature

Test: pass
Change-Id: I54c384abaad7c7aafab31836f34edee5c7c75aac

6 years agoMerge "DO NOT MERGE - Support native and srgb for night display" into oc-mr1-dev
Christine Franks [Wed, 25 Oct 2017 20:15:17 +0000 (20:15 +0000)]
Merge "DO NOT MERGE - Support native and srgb for night display" into oc-mr1-dev

6 years agoMerge "Prevent touch delegate from blocking parent events"
TreeHugger Robot [Wed, 25 Oct 2017 20:11:39 +0000 (20:11 +0000)]
Merge "Prevent touch delegate from blocking parent events"

6 years agoMerge "Provide explicit Network via JobParameters."
Jeff Sharkey [Wed, 25 Oct 2017 20:08:40 +0000 (20:08 +0000)]
Merge "Provide explicit Network via JobParameters."

6 years agoMerge "Removing some system binder calls in AppWidgetHostView"
TreeHugger Robot [Wed, 25 Oct 2017 19:43:21 +0000 (19:43 +0000)]
Merge "Removing some system binder calls in AppWidgetHostView"

6 years agoDO NOT MERGE - Support native and srgb for night display
Christine Franks [Wed, 25 Oct 2017 02:04:22 +0000 (19:04 -0700)]
DO NOT MERGE - Support native and srgb for night display

Bug: 68159303
Test: make -j100

Change-Id: Iea4b38bd8c9037f50b7ffa6e3c4f12b0e536a8ce

6 years agoStart removing remaining pm code to package manager
Dianne Hackborn [Fri, 20 Oct 2017 23:16:32 +0000 (16:16 -0700)]
Start removing remaining pm code to package manager

Everything is now moved out of the pm command except for
the various install commands.  I am going to hold of on
those since they require doing some resolution with the
current implementations in the package manager to make
sure they match and behave identically to the implementations
currently in the pm command.  But other than that, everything
in pm is now just redirecting over to "cmd package".

Also fix up some of the dumpsys output of a few other sevices
when asking to print the data for a particular package, so
the "pm dump" command gives a little more sane result.

Test: manual

Change-Id: I139e06e560203b72243d7eea9543c2240db0f8f8

6 years agoMerge "Merge "Make it possible to dial an operator specific code" am: f4f4ba3d42...
Android Build Merger (Role) [Wed, 25 Oct 2017 19:15:38 +0000 (19:15 +0000)]
Merge "Merge "Make it possible to dial an operator specific code" am: f4f4ba3d42 am: 6519e65ed8 am: a44a9d8b98"

6 years agoMerge "Make it possible to dial an operator specific code" am: f4f4ba3d42 am: 6519e65ed8
Jordan Liu [Wed, 25 Oct 2017 19:12:47 +0000 (19:12 +0000)]
Merge "Make it possible to dial an operator specific code" am: f4f4ba3d42 am: 6519e65ed8
am: a44a9d8b98

Change-Id: I7424799b74b61d3f507fbe8fb99c09d48e30cba8

6 years agoMerge "Revert "Removing stats service registration in system server""
TreeHugger Robot [Wed, 25 Oct 2017 19:11:34 +0000 (19:11 +0000)]
Merge "Revert "Removing stats service registration in system server""

6 years agoMerge "Renaming in BluetoothTile and QSDetailItems"
Lei Yu [Wed, 25 Oct 2017 18:57:59 +0000 (18:57 +0000)]
Merge "Renaming in BluetoothTile and QSDetailItems"

6 years agoMerge "Make it possible to dial an operator specific code" am: f4f4ba3d42
Jordan Liu [Wed, 25 Oct 2017 18:51:21 +0000 (18:51 +0000)]
Merge "Make it possible to dial an operator specific code" am: f4f4ba3d42
am: 6519e65ed8

Change-Id: Ic13742cb8e39beaf8ab722ac9203c22c5e5a83f8

6 years agoMerge "incidentd: Adding proto dump for AlarmManager."
TreeHugger Robot [Wed, 25 Oct 2017 18:43:39 +0000 (18:43 +0000)]
Merge "incidentd: Adding proto dump for AlarmManager."

6 years agoMerge "Make it possible to dial an operator specific code"
Jordan Liu [Wed, 25 Oct 2017 18:40:33 +0000 (18:40 +0000)]
Merge "Make it possible to dial an operator specific code"
am: f4f4ba3d42

Change-Id: I9af399f6ab0d5f95e76b0fd3cc769acc6a75a5b5

6 years agoMerge "Make it possible to dial an operator specific code"
Jordan Liu [Wed, 25 Oct 2017 18:22:31 +0000 (18:22 +0000)]
Merge "Make it possible to dial an operator specific code"

6 years agoMerge "Java side setup and access to Binder Proxy Tracking"
Michael Wachenschwanz [Wed, 25 Oct 2017 18:20:56 +0000 (18:20 +0000)]
Merge "Java side setup and access to Binder Proxy Tracking"

6 years agoMerge "Improve NetworkCapabilities docs." am: 14a51058b1 am: b385ba095b
Jeff Sharkey [Wed, 25 Oct 2017 17:54:35 +0000 (17:54 +0000)]
Merge "Improve NetworkCapabilities docs." am: 14a51058b1 am: b385ba095b
am: f9ae47c5da

Change-Id: I33ef6f930529f9c6e8502613633fffccaa18c192

6 years agoMerge "Improve NetworkCapabilities docs." am: 14a51058b1
Jeff Sharkey [Wed, 25 Oct 2017 17:35:44 +0000 (17:35 +0000)]
Merge "Improve NetworkCapabilities docs." am: 14a51058b1
am: b385ba095b

Change-Id: I3a685156e46c980078c3a91b36e9c1301c29240f

6 years agoRemoving some system binder calls in AppWidgetHostView
Sunny Goyal [Tue, 24 Oct 2017 23:14:12 +0000 (16:14 -0700)]
Removing some system binder calls in AppWidgetHostView

> Using the AppWidgetProviderInfo for applicationInfo instead of getting
  it from packageNamager
> Sending ProviderInfo update when the package is suspended/unsuspended so
  that the provider info on client side is always up-to-date

Bug: 67865199
Test: Manually tested on device
Change-Id: Id44facc30b4c3cc01e155eba9feeb541997fc816

6 years agoMerge "Improve NetworkCapabilities docs."
Jeff Sharkey [Wed, 25 Oct 2017 17:25:17 +0000 (17:25 +0000)]
Merge "Improve NetworkCapabilities docs."
am: 14a51058b1

Change-Id: Ib3c6dd78c7ed41526a734fbc91a81cb4c7fae6d7

6 years agoProvide explicit Network via JobParameters.
Jeff Sharkey [Tue, 24 Oct 2017 22:55:04 +0000 (16:55 -0600)]
Provide explicit Network via JobParameters.

On devices with multiple active networks, or rapidly switching
between networks, we need an API to tell jobs explicitly which
network to use.  (For example, the default route could meet all
job criteria, but we could have changed the default network by the
time we spun up the JobService.)

This also paves the way for us choosing to run jobs over
non-default networks.

Test: verified via DownloadManager
Bug: 64133169
Change-Id: Ic8d654707e39236c8da85a5e172161ac39e5f0b3

6 years agoMerge "Improve NetworkCapabilities docs."
Treehugger Robot [Wed, 25 Oct 2017 17:16:03 +0000 (17:16 +0000)]
Merge "Improve NetworkCapabilities docs."

6 years agoMerge "taskReturnToType be gone!"
Wale Ogunwale [Wed, 25 Oct 2017 17:14:51 +0000 (17:14 +0000)]
Merge "taskReturnToType be gone!"

6 years agoMerge changes Ifee27c86,I9ffa4b00
TreeHugger Robot [Wed, 25 Oct 2017 17:05:44 +0000 (17:05 +0000)]
Merge changes Ifee27c86,I9ffa4b00

* changes:
  Add more atoms to statsd
  Add wakelock atom to statsd

6 years agoMerge "Add some atoms to statsd"
TreeHugger Robot [Wed, 25 Oct 2017 17:04:54 +0000 (17:04 +0000)]
Merge "Add some atoms to statsd"