OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "fixed CdmaSmsAddress parser" am: b00f00e74b
Pengquan Meng [Thu, 30 Nov 2017 00:10:02 +0000 (00:10 +0000)]
Merge "fixed CdmaSmsAddress parser" am: b00f00e74b
am: c8ec8a5e56

Change-Id: Id3830aaea1037b61ecc385715708427c84030206

6 years agoMerge "fixed CdmaSmsAddress parser"
Pengquan Meng [Wed, 29 Nov 2017 23:52:41 +0000 (23:52 +0000)]
Merge "fixed CdmaSmsAddress parser"
am: b00f00e74b

Change-Id: I041c8f3937882b7fd78adf2c2f2cf87fc225b936

6 years agoMerge "fixed CdmaSmsAddress parser"
Pengquan Meng [Wed, 29 Nov 2017 23:38:29 +0000 (23:38 +0000)]
Merge "fixed CdmaSmsAddress parser"

6 years agoMerge "Bluetooth: Pre-pend empty line for dumpsys section headers" am: 8a95711ef1
Andre Eisenbach [Wed, 29 Nov 2017 21:36:44 +0000 (21:36 +0000)]
Merge "Bluetooth: Pre-pend empty line for dumpsys section headers" am: 8a95711ef1
am: f51d382d9c

Change-Id: I698fd46b7784a9093ccfc23e6c1de020f2ac1d3b

6 years agoMerge "Bluetooth: Pre-pend empty line for dumpsys section headers"
Andre Eisenbach [Wed, 29 Nov 2017 21:24:50 +0000 (21:24 +0000)]
Merge "Bluetooth: Pre-pend empty line for dumpsys section headers"
am: 8a95711ef1

Change-Id: I0dbe07aac6e6a8ea1b6858548bd26fffd7e21dd3

6 years agoMerge "Bluetooth: Pre-pend empty line for dumpsys section headers"
Treehugger Robot [Wed, 29 Nov 2017 21:09:40 +0000 (21:09 +0000)]
Merge "Bluetooth: Pre-pend empty line for dumpsys section headers"

6 years agoMerge "Fix issue with PiP callbacks not being handled" am: bdd8adb006
Winson Chung [Wed, 29 Nov 2017 20:50:00 +0000 (20:50 +0000)]
Merge "Fix issue with PiP callbacks not being handled" am: bdd8adb006
am: 4e11a71210

Change-Id: I0ad21e140aa10566f58acfa01fb7e4172edca0d3

6 years agoMerge "Fix issue with PiP callbacks not being handled"
Winson Chung [Wed, 29 Nov 2017 20:34:46 +0000 (20:34 +0000)]
Merge "Fix issue with PiP callbacks not being handled"
am: bdd8adb006

Change-Id: I03c0ef06309b1b7559a973e2823598031de3b182

6 years agoMerge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case" am: edfb333a4d
Hemant Gupta [Wed, 29 Nov 2017 20:29:53 +0000 (20:29 +0000)]
Merge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case" am: edfb333a4d
am: cca3c9bb01

Change-Id: Ia9edce62a31b5344b5627bf0d141d72d40d6e37c

6 years agoMerge "Fix issue with PiP callbacks not being handled"
Winson Chung [Wed, 29 Nov 2017 20:18:45 +0000 (20:18 +0000)]
Merge "Fix issue with PiP callbacks not being handled"

6 years agoMerge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case"
Hemant Gupta [Wed, 29 Nov 2017 20:17:31 +0000 (20:17 +0000)]
Merge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case"
am: edfb333a4d

Change-Id: I28de2826209a16b763d64a1b31381f748067789c

6 years agoMerge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case"
Treehugger Robot [Wed, 29 Nov 2017 20:03:12 +0000 (20:03 +0000)]
Merge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case"

6 years agoMerge "Frameworks: Clean up SharedPreferencesImpl" am: 572f46a3ef
Andreas Gampe [Wed, 29 Nov 2017 19:38:11 +0000 (19:38 +0000)]
Merge "Frameworks: Clean up SharedPreferencesImpl" am: 572f46a3ef
am: 70da38960c

Change-Id: Ia4c24c8cd6fbeb58a90d56319558fc3c78474c2b

6 years agoMerge "Frameworks: Clean up SharedPreferencesImpl"
Andreas Gampe [Wed, 29 Nov 2017 19:25:13 +0000 (19:25 +0000)]
Merge "Frameworks: Clean up SharedPreferencesImpl"
am: 572f46a3ef

Change-Id: I7b922f795283cefabf661e999e5a9897889fa287

6 years agoMerge "Frameworks: Clean up SharedPreferencesImpl"
Treehugger Robot [Wed, 29 Nov 2017 19:11:46 +0000 (19:11 +0000)]
Merge "Frameworks: Clean up SharedPreferencesImpl"

6 years agoBluetooth: Pre-pend empty line for dumpsys section headers
Andre Eisenbach [Mon, 10 Apr 2017 20:49:13 +0000 (13:49 -0700)]
Bluetooth: Pre-pend empty line for dumpsys section headers

Test: manual
Change-Id: I2daa5c985e5504606edd9ff558bd5b92af7a7240

6 years agoOBEX: Avoid pre-sending CONTINUE for SRM enabled case
Hemant Gupta [Fri, 28 Aug 2015 09:43:47 +0000 (15:13 +0530)]
OBEX: Avoid pre-sending CONTINUE for SRM enabled case

Remote Device: LG-G2 as OPP client

Use Case:
1) Pair DUT with Remote.
2) Now push the file from Remote.
3) Ignore the incoming request from Remote

Failure:
RX_Notification lasts only for 10 seconds.

Fix:
OBEX lib handles a PUT Request case with NO BODY header on server
session with CONTINUE  response until body is found in request
packet from remote. However, this needs to be avoided if SRM is
enabled from remote to get proceed transfer authorization
from Application layer.

Test: Send connection request from remote device and verified that
connection is sustainable for 30 seconds until timeout.

Bug: 37886388
Change-Id: I1b5bfd65f9023d77850a34bcb08cfbb435e9a474

6 years agofixed CdmaSmsAddress parser
Pengquan Meng [Thu, 2 Nov 2017 23:56:09 +0000 (16:56 -0700)]
fixed CdmaSmsAddress parser

The digit mode of CdmaSmsAddress is incorrect for international
address.

See 3GPP2 C.S0015-B section 3.4.3.3 Address Parameters for the spec of
CdmaSmsAddress.

Also see the table from 3GPP2 C.S005-D, table2.7.1.3.2.4-2.

Bug: 34805351
Test: unit test
Change-Id: I542a717986009b01d19aef5e61964f03b216a162

6 years agoMerge "Add carrier config variable to hide manage IMS conference call button" am...
Jordan Liu [Tue, 28 Nov 2017 22:11:38 +0000 (22:11 +0000)]
Merge "Add carrier config variable to hide manage IMS conference call button" am: dc98d6e44b
am: 7a42c3614e

Change-Id: I0bb715785a7ea0286936b1213c5057497b8856de

6 years agoMerge "Add carrier config variable to hide manage IMS conference call button"
Jordan Liu [Tue, 28 Nov 2017 22:00:50 +0000 (22:00 +0000)]
Merge "Add carrier config variable to hide manage IMS conference call button"
am: dc98d6e44b

Change-Id: I474338d3475706f856e63fc8c558850c3afd0bb3

6 years agoMerge "Add carrier config variable to hide manage IMS conference call button"
Jordan Liu [Tue, 28 Nov 2017 21:40:01 +0000 (21:40 +0000)]
Merge "Add carrier config variable to hide manage IMS conference call button"

6 years agoAdd carrier config variable to hide manage IMS conference call button
Wei Huang [Fri, 22 Apr 2016 06:33:55 +0000 (14:33 +0800)]
Add carrier config variable to hide manage IMS conference call button

Add carrier config to determine whether manage IMS conference calls
is supported by a carrier.

Test: not tested since a new config is just added
Bug: 28729600
Change-Id: I1000830a85814150658b62ea9add72bfb83bbba0
Merged-In: I1000830a85814150658b62ea9add72bfb83bbba0

6 years agoMerge "Moved DataProfile from telephony internal hidden API to System API" am: 24cd7cbd1e
Jack Yu [Tue, 28 Nov 2017 17:53:48 +0000 (17:53 +0000)]
Merge "Moved DataProfile from telephony internal hidden API to System API" am: 24cd7cbd1e
am: 3221d23138

Change-Id: I3b1e2d475721de9388de5cb4acb52a003cc16e62

6 years agoMerge "Add persistent state for Hearing Aid Profile" am: 2282e2f57f
Jakub Pawlowski [Tue, 28 Nov 2017 17:42:08 +0000 (17:42 +0000)]
Merge "Add persistent state for Hearing Aid Profile" am: 2282e2f57f
am: 0f9b8c2c60

Change-Id: I971ab43aed9d0f656e0878e7277ec8e416b1867f

6 years agoMerge "Moved DataProfile from telephony internal hidden API to System API"
Jack Yu [Tue, 28 Nov 2017 17:39:01 +0000 (17:39 +0000)]
Merge "Moved DataProfile from telephony internal hidden API to System API"
am: 24cd7cbd1e

Change-Id: Ica76a82b03f6bb0623a98480ae1c2fbc34d07337

6 years agoMerge "Add persistent state for Hearing Aid Profile"
Jakub Pawlowski [Tue, 28 Nov 2017 17:32:19 +0000 (17:32 +0000)]
Merge "Add persistent state for Hearing Aid Profile"
am: 2282e2f57f

Change-Id: Iff05733aeb2214b1720883f6c7c28a3357887ec2

6 years agoMerge "Moved DataProfile from telephony internal hidden API to System API"
Jack Yu [Tue, 28 Nov 2017 17:21:40 +0000 (17:21 +0000)]
Merge "Moved DataProfile from telephony internal hidden API to System API"

6 years agoMerge "Add persistent state for Hearing Aid Profile"
Jakub Pawlowski [Tue, 28 Nov 2017 17:21:10 +0000 (17:21 +0000)]
Merge "Add persistent state for Hearing Aid Profile"

6 years agoAdd persistent state for Hearing Aid Profile
Jakub Pawlowski [Wed, 22 Nov 2017 18:57:42 +0000 (10:57 -0800)]
Add persistent state for Hearing Aid Profile

Defines the flag used in code and the Settings.Global key names for
persisting state of the Bluetooth Hearing Aid Profile.

Test: manual
Bug: 69623109
Change-Id: I19e68be55a80f338bdc5d39d6c3c6d251f1cb514
Merged-In: I19e68be55a80f338bdc5d39d6c3c6d251f1cb514

6 years agoMerge "Add documentation for O and O_MR1 target SDK changes." into oc-mr1-dev
Dianne Hackborn [Tue, 28 Nov 2017 00:50:13 +0000 (00:50 +0000)]
Merge "Add documentation for O and O_MR1 target SDK changes." into oc-mr1-dev
am: b94e697dcf

Change-Id: I40ef78ee243cbb2f5967115e40740a3f36b253ef

6 years agoMerge "Add documentation for O and O_MR1 target SDK changes." into oc-mr1-dev
TreeHugger Robot [Tue, 28 Nov 2017 00:28:07 +0000 (00:28 +0000)]
Merge "Add documentation for O and O_MR1 target SDK changes." into oc-mr1-dev

6 years agoMoved DataProfile from telephony internal hidden API to System API
Jack Yu [Mon, 20 Nov 2017 19:14:23 +0000 (11:14 -0800)]
Moved DataProfile from telephony internal hidden API to System API

This is the preliminary change in order to make the new data call
setup API for IWLAN refactoring.

Test: Telephony sanity tests + unit tests
bug: 64132030

Merged-In: Ib96dc3dd577def0a428e2f5cdb5fb7f742120020
Change-Id: Ib96dc3dd577def0a428e2f5cdb5fb7f742120020
(cherry picked from commit fc84bb5f5c6e30db0eca589eb67b406bf4bfadbe)

6 years agoMerge "More dimming tweaks (for accessibility)" into oc-mr1-dev
Jason Monk [Mon, 27 Nov 2017 22:35:55 +0000 (22:35 +0000)]
Merge "More dimming tweaks (for accessibility)" into oc-mr1-dev
am: dbb448a3d7

Change-Id: I94fe9f6055a48cdc596fe333a3f6d304cb7e33da

6 years agoFixes javadoc documentation of PackageInstaller.SessionParams#setOriginatingUid(int)
Nikolas Bravo [Mon, 27 Nov 2017 22:29:21 +0000 (22:29 +0000)]
Fixes javadoc documentation of PackageInstaller.SessionParams#setOriginatingUid(int)
am: 8aaf928fcd

Change-Id: I4a2efd6052b1bcc5344fd23722745b3532fb01c9

6 years agoMerge "More dimming tweaks (for accessibility)" into oc-mr1-dev
TreeHugger Robot [Mon, 27 Nov 2017 22:21:09 +0000 (22:21 +0000)]
Merge "More dimming tweaks (for accessibility)" into oc-mr1-dev

6 years agoAdd documentation for O and O_MR1 target SDK changes.
Dianne Hackborn [Tue, 21 Nov 2017 23:04:57 +0000 (15:04 -0800)]
Add documentation for O and O_MR1 target SDK changes.

Whoops, forgot to do this!

Bug: 69805350
Test: built and looked
Change-Id: Ic42cbcb7a62e7474c4864d66944452fed2e9005c

6 years agoMerge "Clarify docs, sanity check roaming state." am: 419ec05284
Jeff Sharkey [Mon, 27 Nov 2017 21:39:56 +0000 (21:39 +0000)]
Merge "Clarify docs, sanity check roaming state." am: 419ec05284
am: 63b5615b2a

Change-Id: If4f09f8a0e32c245552f025f1a61d67f842b1841

6 years agoMerge "Clarify docs, sanity check roaming state."
Jeff Sharkey [Mon, 27 Nov 2017 21:30:57 +0000 (21:30 +0000)]
Merge "Clarify docs, sanity check roaming state."
am: 419ec05284

Change-Id: Ic30d5aaadf2c59978162c53d7e7781847244ce52

6 years agoMerge "Clarify docs, sanity check roaming state."
Jeff Sharkey [Mon, 27 Nov 2017 21:19:40 +0000 (21:19 +0000)]
Merge "Clarify docs, sanity check roaming state."

6 years agoFixes javadoc documentation of PackageInstaller.SessionParams#setOriginatingUid(int)
Nikolas Bravo [Tue, 7 Nov 2017 21:07:15 +0000 (21:07 +0000)]
Fixes javadoc documentation of PackageInstaller.SessionParams#setOriginatingUid(int)

* Current "See also" link in https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionParams.html#setOriginatingUid(int) is not only wrong, but also broken
* Added a missing "the"

Bug: 69799046
Fixes: 69799046
Test: make ds-docs (run by asolovay@)
Change-Id: I90410ed3393b5c37afdf0476eb70821fae9f63fd
(cherry picked from commit 6283100a87b7be5fb1aad9a258ebba9faf74b061)

6 years agoClarify docs, sanity check roaming state.
Jeff Sharkey [Thu, 9 Nov 2017 20:11:50 +0000 (13:11 -0700)]
Clarify docs, sanity check roaming state.

Update public docs to hide the fact that NetworkCapabilities is only
used inside NetworkRequest as an implementation detail.

Take up less room on the wire when passing NetworkCapabilities around
via NetworkRequest.

Sanity check that the roaming state between NetworkInfo and
NetworkCapabilities is in agreement.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.,com.android.server.connectivity.,com.android.server.ConnectivityServiceTest
Bug: 67040695
Change-Id: I982b4c3c41a140934bbad3b8ca8f12dc3814e86c

6 years agoMerge "android.os.HidlSupport: add getPidIfSharable() for HALs" am: e72b6f0d31
Yifan Hong [Wed, 22 Nov 2017 23:18:46 +0000 (23:18 +0000)]
Merge "android.os.HidlSupport: add getPidIfSharable() for HALs" am: e72b6f0d31
am: 8cf7761747

Change-Id: I842bf4791467620e597018ce0e9441cfb0732026

6 years agoMerge "android.os.HidlSupport: add getPidIfSharable() for HALs"
Yifan Hong [Wed, 22 Nov 2017 23:06:33 +0000 (23:06 +0000)]
Merge "android.os.HidlSupport: add getPidIfSharable() for HALs"
am: e72b6f0d31

Change-Id: I7ea5895cdfd09786732b597be600329a334c1cb4

6 years agoMerge "android.os.HidlSupport: add getPidIfSharable() for HALs"
Yifan Hong [Wed, 22 Nov 2017 22:51:19 +0000 (22:51 +0000)]
Merge "android.os.HidlSupport: add getPidIfSharable() for HALs"

6 years agoMerge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL" am: 80aefae026
Jordan Liu [Wed, 22 Nov 2017 22:26:49 +0000 (22:26 +0000)]
Merge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL" am: 80aefae026
am: e6e67e2396

Change-Id: I5b0219998a6de6709bec137237583c050a6cdc02

6 years agoMerge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL"
Jordan Liu [Wed, 22 Nov 2017 22:17:47 +0000 (22:17 +0000)]
Merge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL"
am: 80aefae026

Change-Id: Ie18492114c58d1c83c060712d2a936687353ea99

6 years agoMerge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL"
Jordan Liu [Wed, 22 Nov 2017 22:09:33 +0000 (22:09 +0000)]
Merge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL"

6 years agoMerge "Refactor ImsService to AIDL" am: 8a02c63f16
Brad Ebinger [Wed, 22 Nov 2017 19:32:29 +0000 (19:32 +0000)]
Merge "Refactor ImsService to AIDL" am: 8a02c63f16
am: e575ad10ca

Change-Id: I760a56622f5db4fe241d0174711ff107ff072c8d

6 years agoMerge "Refactor ImsService to AIDL"
Brad Ebinger [Wed, 22 Nov 2017 19:23:16 +0000 (19:23 +0000)]
Merge "Refactor ImsService to AIDL"
am: 8a02c63f16

Change-Id: I195d7ccff8498241b6c7be819d2ee96b661d51e1

6 years agoMerge "Refactor ImsService to AIDL"
Brad Ebinger [Wed, 22 Nov 2017 19:16:21 +0000 (19:16 +0000)]
Merge "Refactor ImsService to AIDL"

6 years agoFix issue with PiP callbacks not being handled
Shuichi.Noguchi [Wed, 22 Nov 2017 08:24:17 +0000 (17:24 +0900)]
Fix issue with PiP callbacks not being handled

For secondary users, stopping primary user process
is not necessary anymore since PiP is managed
in the primary user's SystemUI process,
this logic was prevening the relaunching of the activity.

Test: Launch PiP from a secondary user on TV device,
      restart the activity and ensure that it is brought
      to fullscreen.

Change-Id: I3a0658c9f55f85771b92a71a1ddeb0f9d544e869

6 years agoMerge "Light refactors to packet wakeup events." am: e887e2b9c1
Hugo Benichi [Wed, 22 Nov 2017 05:27:11 +0000 (05:27 +0000)]
Merge "Light refactors to packet wakeup events." am: e887e2b9c1
am: c6dc6baf4f

Change-Id: I4c19f1cdfe7a9fb47aad23a21b0aa0ae8e03277a

6 years agoMerge "Light refactors to packet wakeup events."
Hugo Benichi [Wed, 22 Nov 2017 05:19:01 +0000 (05:19 +0000)]
Merge "Light refactors to packet wakeup events."
am: e887e2b9c1

Change-Id: I40f637114cbfc04bce4058af0a1f43f38bd461db

6 years agoMerge "Light refactors to packet wakeup events."
Hugo Benichi [Wed, 22 Nov 2017 05:08:50 +0000 (05:08 +0000)]
Merge "Light refactors to packet wakeup events."

6 years agoMerge "Javadoc cleanup of IpSecManager API." am: d09d106ec0
Jonathan Basseri [Wed, 22 Nov 2017 02:00:53 +0000 (02:00 +0000)]
Merge "Javadoc cleanup of IpSecManager API." am: d09d106ec0
am: 2a82aa70b5

Change-Id: I53e9b3d18fda1122f6a8a6300185c743cc26dbf6

6 years agoMerge "Javadoc cleanup of IpSecManager API."
Jonathan Basseri [Wed, 22 Nov 2017 01:51:46 +0000 (01:51 +0000)]
Merge "Javadoc cleanup of IpSecManager API."
am: d09d106ec0

Change-Id: Iaf206b0980d3bed14fe6b8318d2073577212b460

6 years agoMerge "Javadoc cleanup of IpSecManager API."
Jonathan Basseri [Wed, 22 Nov 2017 01:32:06 +0000 (01:32 +0000)]
Merge "Javadoc cleanup of IpSecManager API."

6 years agoLight refactors to packet wakeup events.
Hugo Benichi [Tue, 14 Nov 2017 13:42:46 +0000 (22:42 +0900)]
Light refactors to packet wakeup events.

This patch uses the recently added MacAddress class in WakeupEvent and
WakeupStats for replacing the byte array representation of dest mac
addresses in packet wakeup events.

Bug: 28806131
Test: runtest frameworks-net
Merged-In: I5a3c76498a4b720f0d9308a65b5dd4b32377d0d1

(partial cherry pick from 884970e0ba74c96f7c375454d3c58bb3fdc0bf46)

Change-Id: I878d51d4cc53c6d9a2cc3c55faa15b86156afbd7

6 years agoFrameworks: Clean up SharedPreferencesImpl
Andreas Gampe [Tue, 21 Nov 2017 23:31:43 +0000 (15:31 -0800)]
Frameworks: Clean up SharedPreferencesImpl

Clean up in preparation for an implementation change. Add missing
annotations. Rename inner lock to be uniquely named. Use the local
map instead of mMap in the commit logic.

Test: m
Test: m cts && cts-tradefed run commandAndExit cts-dev --module CtsContentTestCases -c android.content.cts.SharedPreferencesTest
Change-Id: Id3a798732c83a4aa6487225e2375ade4985852e2

6 years agoMerge "Provide materials for Mobile network settings UI." am: 8b759f234b -s ours
Malcolm Chen [Tue, 21 Nov 2017 23:29:53 +0000 (23:29 +0000)]
Merge "Provide materials for Mobile network settings UI." am: 8b759f234b  -s ours
am: 4b7d25e374  -s ours

Change-Id: I71fa4cdd2170bc1ccf39f04f092ea9447f988d1f

6 years agoMerge "Provide materials for Mobile network settings UI."
Malcolm Chen [Tue, 21 Nov 2017 23:18:13 +0000 (23:18 +0000)]
Merge "Provide materials for Mobile network settings UI."
am: 8b759f234b  -s ours

Change-Id: I1e4627084e000f0e3a45005b4a2df34e51fcc0fa

6 years agoMerge "Provide materials for Mobile network settings UI."
Treehugger Robot [Tue, 21 Nov 2017 23:05:21 +0000 (23:05 +0000)]
Merge "Provide materials for Mobile network settings UI."

6 years agoMerge "Avoid clearing default browser setting when unnecessary" am: ef32746fc5
tiansiming [Tue, 21 Nov 2017 22:49:19 +0000 (22:49 +0000)]
Merge "Avoid clearing default browser setting when unnecessary" am: ef32746fc5
am: 3ee9594a27

Change-Id: If8d39e9cb350861913deda62b1351d8a4e52607a

6 years agoMerge "Avoid clearing default browser setting when unnecessary"
tiansiming [Tue, 21 Nov 2017 22:40:35 +0000 (22:40 +0000)]
Merge "Avoid clearing default browser setting when unnecessary"
am: ef32746fc5

Change-Id: I647c96b9a96612c4745e6ebec5d44cebd6d42767

6 years agoMerge "Avoid clearing default browser setting when unnecessary"
Treehugger Robot [Tue, 21 Nov 2017 22:22:08 +0000 (22:22 +0000)]
Merge "Avoid clearing default browser setting when unnecessary"

6 years agoMerge "PackageManager: Extend cmd interface feedback" am: d66bc0aaae
Andreas Gampe [Tue, 21 Nov 2017 21:04:36 +0000 (21:04 +0000)]
Merge "PackageManager: Extend cmd interface feedback" am: d66bc0aaae
am: 362a3b9e2a

Change-Id: I7b3ba7adde559c66ed9b8c02d5dd8134a9aa2b38

6 years agoMerge "PackageManager: Extend cmd interface feedback"
Andreas Gampe [Tue, 21 Nov 2017 20:55:13 +0000 (20:55 +0000)]
Merge "PackageManager: Extend cmd interface feedback"
am: d66bc0aaae

Change-Id: Ic89e1e9e4b5e250bc867d288cf4870690926248c

6 years agoMerge "PackageManager: Extend cmd interface feedback"
Treehugger Robot [Tue, 21 Nov 2017 20:38:18 +0000 (20:38 +0000)]
Merge "PackageManager: Extend cmd interface feedback"

6 years agoPackageManager: Extend cmd interface feedback
Andreas Gampe [Tue, 21 Nov 2017 01:03:17 +0000 (17:03 -0800)]
PackageManager: Extend cmd interface feedback

When running cmd package compile -a, print the progress, as this
may be a long-running operation.

Test: m
Test: manual
Merged-In: Ic5c8123f972656b722da882d6a19d555b8c60832
Change-Id: Ic5c8123f972656b722da882d6a19d555b8c60832

6 years agoMerge "Adding "Mobile data" and "Data usage" button in mobile settings." am: 06e314f6...
Malcolm Chen [Tue, 21 Nov 2017 00:58:19 +0000 (00:58 +0000)]
Merge "Adding "Mobile data" and "Data usage" button in mobile settings." am: 06e314f6cc  -s ours
am: 959385c314  -s ours

Change-Id: Ie6d211fd5ebfeb5a191e1d96a7d3bb37ee9b7d23

6 years agoMerge "Adding "Mobile data" and "Data usage" button in mobile settings."
Malcolm Chen [Tue, 21 Nov 2017 00:48:30 +0000 (00:48 +0000)]
Merge "Adding "Mobile data" and "Data usage" button in mobile settings."
am: 06e314f6cc  -s ours

Change-Id: I3e7e4818688b8e046499513557825809772a1085

6 years agoMerge "Adding "Mobile data" and "Data usage" button in mobile settings."
Treehugger Robot [Tue, 21 Nov 2017 00:35:42 +0000 (00:35 +0000)]
Merge "Adding "Mobile data" and "Data usage" button in mobile settings."

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Mon, 20 Nov 2017 22:27:19 +0000 (22:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: c7d9045105  -s ours

Change-Id: I4e65a2c460b3bcfa2e258a2952677b16d89e4d85

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 20 Nov 2017 22:13:17 +0000 (22:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Use -Werror in frameworks/base" am: a29836ad04
Chih-hung Hsieh [Mon, 20 Nov 2017 21:40:59 +0000 (21:40 +0000)]
Merge "Use -Werror in frameworks/base" am: a29836ad04
am: 267a2a8c8a

Change-Id: Ibfc63a029813ef952dc94f11baae7a96850e94d6

6 years agoMerge "Use -Werror in frameworks/base"
Chih-hung Hsieh [Mon, 20 Nov 2017 21:33:00 +0000 (21:33 +0000)]
Merge "Use -Werror in frameworks/base"
am: a29836ad04

Change-Id: Ie76322acc3b471da60a033cfa2474c1039d70339

6 years agoMerge "Make SharedPreferences check with higher precision" am: 9ca31879b0 -s ours
Philip P. Moltmann [Mon, 20 Nov 2017 21:27:45 +0000 (21:27 +0000)]
Merge "Make SharedPreferences check with higher precision" am: 9ca31879b0  -s ours
am: 79d7319d7e  -s ours

Change-Id: Ifd52e21336a32ecd195e61336ac90777ba990925

6 years agoMerge "Make SharedPreferences check with higher precision"
Philip P. Moltmann [Mon, 20 Nov 2017 21:19:57 +0000 (21:19 +0000)]
Merge "Make SharedPreferences check with higher precision"
am: 9ca31879b0  -s ours

Change-Id: Ie7065c2281bdf6a97af69c2d758d4c2ff55956ae

6 years agoMerge "Use -Werror in frameworks/base"
Chih-hung Hsieh [Mon, 20 Nov 2017 21:18:52 +0000 (21:18 +0000)]
Merge "Use -Werror in frameworks/base"

6 years agoMerge "Make SharedPreferences check with higher precision"
Treehugger Robot [Mon, 20 Nov 2017 21:04:10 +0000 (21:04 +0000)]
Merge "Make SharedPreferences check with higher precision"

6 years agoMerge "Add output file and dependencies to fontchain_lint" am: b0a3e9dc83
Colin Cross [Mon, 20 Nov 2017 20:44:02 +0000 (20:44 +0000)]
Merge "Add output file and dependencies to fontchain_lint" am: b0a3e9dc83
am: 4db8be0bb3

Change-Id: Ied0b30fca889b55dbf4d0c7075424cf6244178b3

6 years agoMerge "Add output file and dependencies to fontchain_lint"
Colin Cross [Mon, 20 Nov 2017 20:36:15 +0000 (20:36 +0000)]
Merge "Add output file and dependencies to fontchain_lint"
am: b0a3e9dc83

Change-Id: I835565031398b97c995260a0bfc9c8f1f50cef2e

6 years agoMerge "Add output file and dependencies to fontchain_lint"
Treehugger Robot [Mon, 20 Nov 2017 20:24:26 +0000 (20:24 +0000)]
Merge "Add output file and dependencies to fontchain_lint"

6 years agoandroid.os.HidlSupport: add getPidIfSharable() for HALs
Yifan Hong [Wed, 15 Nov 2017 00:14:04 +0000 (16:14 -0800)]
android.os.HidlSupport: add getPidIfSharable() for HALs

... that returns PID of the process for debuggable builds.
This calls into the C++ equivalent of the function.

Test: lshal
Bug: 68992575

Change-Id: Ia177c709c6930510035cff33dc2389441a76351d

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 20 Nov 2017 19:51:02 +0000 (11:51 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ic8d1823c3ff2b69bbbe2d215cb8981dc97cbed41

6 years agoUse -Werror in frameworks/base
Chih-Hung Hsieh [Mon, 20 Nov 2017 18:57:19 +0000 (10:57 -0800)]
Use -Werror in frameworks/base

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Ibfe36a62d9a91b7df813b42e18dafaa58dc8b60d

6 years agoJavadoc cleanup of IpSecManager API.
Jonathan Basseri [Fri, 21 Apr 2017 22:53:51 +0000 (15:53 -0700)]
Javadoc cleanup of IpSecManager API.

This changes only comments and annotations, which results
in minor API changes.

Bug: 63777932
Test: `make update-api` and visually inspect generated HTML.
Change-Id: I7a7a9244eade6cc55aca17a47e0a838cd6f84cc9

6 years agoMake SharedPreferences check with higher precision
Philip P. Moltmann [Mon, 17 Jul 2017 19:41:53 +0000 (12:41 -0700)]
Make SharedPreferences check with higher precision

When two processes modify shared preferences we use the timestamp to
figure out if the file was changes underneath. Do this with the highest
precision available (instead of sec) as before.

It would be possible to make the check more reliable by writing a unique
id to the shared pref file, but this would make this check much more
expensive in the common case that nothing changed. Considering that this
has not been a problem and we don't officially give any guarantee for
this sounds like a good middle-ground.

(cherry picked from commit ffe74357aec5330098795000e131e8d581b8b274)

Merged-In: I04c96b6a946618d5599c26410c88d7cd654d31fb
Change-Id: I04c96b6a946618d5599c26410c88d7cd654d31fb
Test: SharedPreferencesTest
Fixes: 62949739

6 years agoMerge "AAPT2: whitelist alphanums instead of blacklisting hyphens in package names...
Donald Chai [Sat, 18 Nov 2017 03:19:30 +0000 (03:19 +0000)]
Merge "AAPT2: whitelist alphanums instead of blacklisting hyphens in package names." into oc-mr1-dev
am: e7b0a330db

Change-Id: I7943dc35ceeca0c3fdb4df668a761889cd0add2d

6 years agoMerge "AAPT2: whitelist alphanums instead of blacklisting hyphens in package names...
TreeHugger Robot [Sat, 18 Nov 2017 03:03:19 +0000 (03:03 +0000)]
Merge "AAPT2: whitelist alphanums instead of blacklisting hyphens in package names." into oc-mr1-dev

6 years agoMerge "Update the comments for all CellIdentity*." am: 2610ad0556
Cassie [Sat, 18 Nov 2017 00:39:17 +0000 (00:39 +0000)]
Merge "Update the comments for all CellIdentity*." am: 2610ad0556
am: 4f95fd8532

Change-Id: I8ee47862cb6651baae20a79360f7c0c9a94137cc

6 years agoMerge "Update the comments for all CellIdentity*."
Cassie [Sat, 18 Nov 2017 00:27:09 +0000 (00:27 +0000)]
Merge "Update the comments for all CellIdentity*."
am: 2610ad0556

Change-Id: I81f4e4a6bd0960ce3d2d51bfe15711a5c3eda9fb

6 years agoMerge "Update the comments for all CellIdentity*."
Treehugger Robot [Sat, 18 Nov 2017 00:16:37 +0000 (00:16 +0000)]
Merge "Update the comments for all CellIdentity*."

6 years agoMerge "Build fontchain_lint using python_binary_host" am: 7ecac139ea
Nan Zhang [Fri, 17 Nov 2017 22:20:57 +0000 (22:20 +0000)]
Merge "Build fontchain_lint using python_binary_host" am: 7ecac139ea
am: 7ade558ad2

Change-Id: Ie920005b39a476b281333b12fbed9e586a2ce3e7

6 years agoUpdate the comments for all CellIdentity*.
Cassie [Fri, 17 Nov 2017 22:16:01 +0000 (14:16 -0800)]
Update the comments for all CellIdentity*.

Bug: 63984327
Test: Basic telephony sanity
Change-Id: Icb9ba99cefb93a7c4a39cbc653ae046df8649cf9

6 years agoMerge "Build fontchain_lint using python_binary_host"
Nan Zhang [Fri, 17 Nov 2017 22:12:58 +0000 (22:12 +0000)]
Merge "Build fontchain_lint using python_binary_host"
am: 7ecac139ea

Change-Id: I4fef971c8fc8837f73644667988ddc3e7f4305ec

6 years agoMerge "Build fontchain_lint using python_binary_host"
Treehugger Robot [Fri, 17 Nov 2017 22:03:27 +0000 (22:03 +0000)]
Merge "Build fontchain_lint using python_binary_host"

6 years agoMerge "Add missing } on @link tag." am: 31b0c6fb32
Tyler Gunn [Fri, 17 Nov 2017 19:36:07 +0000 (19:36 +0000)]
Merge "Add missing } on @link tag." am: 31b0c6fb32
am: 80bfc216ca

Change-Id: Id241939f950517df7b09171913c958cdc6360a3b

6 years agoMerge "Add missing } on @link tag."
Tyler Gunn [Fri, 17 Nov 2017 19:27:12 +0000 (19:27 +0000)]
Merge "Add missing } on @link tag."
am: 31b0c6fb32

Change-Id: I2249cab4a50a9788cd8decb23fd8c60419ab6c21

6 years agoMerge "Add missing } on @link tag."
Tyler Gunn [Fri, 17 Nov 2017 19:13:53 +0000 (19:13 +0000)]
Merge "Add missing } on @link tag."