OSDN Git Service
Bill Yi [Thu, 30 Nov 2017 22:18:13 +0000 (22:18 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
7e3f498034 -s ours
Change-Id: I58269033b0b7197f5da1637a073e20687b021dde
Bill Yi [Thu, 30 Nov 2017 22:11:12 +0000 (22:11 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
1536c4ed80 -s ours
Change-Id: I6ebc82f3feff22872f2a94f6f52b56300a096517
Bill Yi [Thu, 30 Nov 2017 22:06:01 +0000 (22:06 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
0b3911b32f -s ours
Change-Id: I7b12b5dd06b50c636f2511ec0f6e5dd30a631bd1
Bill Yi [Thu, 30 Nov 2017 21:47:29 +0000 (21:47 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
c168312e92 -s ours
Change-Id: Iaf3798c24777e711a4b8b9545b2fde655046811b
Bill Yi [Thu, 30 Nov 2017 21:43:42 +0000 (21:43 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
ea754a6814 -s ours
Change-Id: I8a889554572839e12eb0e293d85982b707d4086e
Bill Yi [Thu, 30 Nov 2017 21:38:54 +0000 (21:38 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
23e0aacf9f -s ours
Change-Id: Iffa9e589502b1b310e8adf7b5005aafe9e39c73d
Bill Yi [Thu, 30 Nov 2017 21:31:42 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
b233aa7360 -s ours
Change-Id: I041d08b9e110ffb4d285139f4550d00f1521cb98
Bill Yi [Thu, 30 Nov 2017 21:24:59 +0000 (21:24 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
fac8c29db6 -s ours
Change-Id: I78bbc45aa215f7620224d4e7cd121131a9b34700
Bill Yi [Thu, 30 Nov 2017 21:10:57 +0000 (21:10 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
18fd5109c9 -s ours
Change-Id: I66a71face01ca5e2e3fa1ee720cf85b68af6d6aa
TreeHugger Robot [Thu, 30 Nov 2017 21:02:12 +0000 (21:02 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 21:01:29 +0000 (21:01 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 21:00:40 +0000 (21:00 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 21:00:00 +0000 (21:00 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 20:58:41 +0000 (20:58 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 20:57:44 +0000 (20:57 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 20:56:37 +0000 (20:56 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 20:53:57 +0000 (20:53 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 20:52:04 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Kevin Hufnagle [Thu, 30 Nov 2017 19:24:10 +0000 (19:24 +0000)]
cherry-pick from oc-dev: docs: Note regarding device IDs, Build.java
am:
d6ebb55c62
Change-Id: I88bf4c778a04b5f43a7fcd22d4aadb378860bb8a
Mohamed [Thu, 30 Nov 2017 16:15:58 +0000 (16:15 +0000)]
Merge "Add SMS over IMS APIs" am:
74445ed311
am:
208f232825
Change-Id: If9b5427292eaa41b6381351c57ec5cad4b6bc4a1
Mohamed [Thu, 30 Nov 2017 16:05:36 +0000 (16:05 +0000)]
Merge "Add SMS over IMS APIs"
am:
74445ed311
Change-Id: I5b08b82f39968adc111d0b3361b4312eb7244913
Treehugger Robot [Thu, 30 Nov 2017 15:56:30 +0000 (15:56 +0000)]
Merge "Add SMS over IMS APIs"
Bill Yi [Thu, 30 Nov 2017 10:51:39 +0000 (02:51 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
69925163
Change-Id: Id4714728cce7cdc505ef573f61b0807eaf99f638
Bill Yi [Thu, 30 Nov 2017 08:48:58 +0000 (00:48 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
69925163
Change-Id: I2ea80486888541821be5a1e2d446097e77344ff7
Bill Yi [Thu, 30 Nov 2017 08:43:30 +0000 (00:43 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
69925163
Change-Id: Iefa1c8df1516425e13eeeb7a4f4636289cc5ed61
Bill Yi [Thu, 30 Nov 2017 06:56:53 +0000 (22:56 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
69925163
Change-Id: Ie7f618c50bfc451f5204eee4a297556adb196b46
Bill Yi [Thu, 30 Nov 2017 06:42:06 +0000 (22:42 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
69925163
Change-Id: Ided857799b25fe123782edb65ef2b54f1244af5d
Bill Yi [Thu, 30 Nov 2017 06:34:30 +0000 (22:34 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
69925163
Change-Id: I648ee3247fda8398c0ca6d6f4a46a11934966d0f
Bill Yi [Thu, 30 Nov 2017 06:00:05 +0000 (22:00 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
69925163
Change-Id: I49111f0ab267e797467bed312cced654e9085552
Bill Yi [Thu, 30 Nov 2017 05:52:53 +0000 (21:52 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
69925163
Change-Id: Ic8b80f7703cab100a2b5eaebb3bf48ea0b5164c6
Bill Yi [Thu, 30 Nov 2017 05:44:48 +0000 (21:44 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
69925163
Change-Id: Iaf4029cb66b19628b02847e281b7bba702cbf3f4
Chih-hung Hsieh [Thu, 30 Nov 2017 02:27:13 +0000 (02:27 +0000)]
Merge "Use -Werror in frameworks/base/media/mca/filterfw" am:
171fce8377
am:
cba4979a6a
Change-Id: Ifea0bcb3e48a83ba21c24026d95819f4f947d039
Chih-hung Hsieh [Thu, 30 Nov 2017 02:19:13 +0000 (02:19 +0000)]
Merge "Use -Werror in frameworks/base/media/mca/filterfw"
am:
171fce8377
Change-Id: I698ee4b4d6c884469253238795d23bdb21a54542
Chih-hung Hsieh [Thu, 30 Nov 2017 01:55:47 +0000 (01:55 +0000)]
Merge "Use -Werror in frameworks/base/media/mca/filterfw"
Mohamed [Tue, 28 Nov 2017 02:40:09 +0000 (18:40 -0800)]
Add SMS over IMS APIs
- Adds public APIs that IMS providers will implement/use
- Adds aidl APIs for internal communications to support SMS over IMS.
- First pass at documentation of APIs.
Moving over from ag/
3265442
Bug:
69846044
Test: None
Change-Id: Ic665a2a7d64a56417bcf2a159d6b88b05cdb832a
Pengquan Meng [Thu, 30 Nov 2017 00:10:02 +0000 (00:10 +0000)]
Merge "fixed CdmaSmsAddress parser" am:
b00f00e74b
am:
c8ec8a5e56
Change-Id: Id3830aaea1037b61ecc385715708427c84030206
Pengquan Meng [Wed, 29 Nov 2017 23:52:41 +0000 (23:52 +0000)]
Merge "fixed CdmaSmsAddress parser"
am:
b00f00e74b
Change-Id: I041c8f3937882b7fd78adf2c2f2cf87fc225b936
Pengquan Meng [Wed, 29 Nov 2017 23:38:29 +0000 (23:38 +0000)]
Merge "fixed CdmaSmsAddress parser"
Chih-Hung Hsieh [Wed, 29 Nov 2017 22:43:12 +0000 (14:43 -0800)]
Use -Werror in frameworks/base/media/mca/filterfw
Bug:
66996870
Test: build with WITH_TIDY=1
Change-Id: I12137a0b40357954af63bac3771332773b03da9a
Kevin Hufnagle [Tue, 16 May 2017 23:48:10 +0000 (16:48 -0700)]
cherry-pick from oc-dev: docs: Note regarding device IDs, Build.java
Added note within getSerial() in android.os.Build class. Device
identifiers, such as hardware serial numbers, can be modified if a
device is rooted. Others can use key attestation to discover these
changes. Added a note to this effect within this method.
Test: make ds-docs -j8
Bug:
38312326
Change-Id: I76e3f6a15b9a8673ca3304218653e8cd26da38d7
Original-Change-Id: Ibd2dab621c14683e12a213957b567ee49b8d00fd
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
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
Treehugger Robot [Wed, 29 Nov 2017 21:09:40 +0000 (21:09 +0000)]
Merge "Bluetooth: Pre-pend empty line for dumpsys section headers"
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
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
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
Winson Chung [Wed, 29 Nov 2017 20:18:45 +0000 (20:18 +0000)]
Merge "Fix issue with PiP callbacks not being handled"
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
Treehugger Robot [Wed, 29 Nov 2017 20:03:12 +0000 (20:03 +0000)]
Merge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case"
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
Andreas Gampe [Wed, 29 Nov 2017 19:25:13 +0000 (19:25 +0000)]
Merge "Frameworks: Clean up SharedPreferencesImpl"
am:
572f46a3ef
Change-Id: I7b922f795283cefabf661e999e5a9897889fa287
Treehugger Robot [Wed, 29 Nov 2017 19:11:46 +0000 (19:11 +0000)]
Merge "Frameworks: Clean up SharedPreferencesImpl"
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
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
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
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
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
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"
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
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
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
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
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
Jack Yu [Tue, 28 Nov 2017 17:21:40 +0000 (17:21 +0000)]
Merge "Moved DataProfile from telephony internal hidden API to System API"
Jakub Pawlowski [Tue, 28 Nov 2017 17:21:10 +0000 (17:21 +0000)]
Merge "Add 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
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
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
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)
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
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
TreeHugger Robot [Mon, 27 Nov 2017 22:21:09 +0000 (22:21 +0000)]
Merge "More dimming tweaks (for accessibility)" into oc-mr1-dev
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
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
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
Jeff Sharkey [Mon, 27 Nov 2017 21:19:40 +0000 (21:19 +0000)]
Merge "Clarify docs, sanity check roaming state."
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)
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
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
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
Yifan Hong [Wed, 22 Nov 2017 22:51:19 +0000 (22:51 +0000)]
Merge "android.os.HidlSupport: add getPidIfSharable() for HALs"
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
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
Jordan Liu [Wed, 22 Nov 2017 22:09:33 +0000 (22:09 +0000)]
Merge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL"
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
Brad Ebinger [Wed, 22 Nov 2017 19:23:16 +0000 (19:23 +0000)]
Merge "Refactor ImsService to AIDL"
am:
8a02c63f16
Change-Id: I195d7ccff8498241b6c7be819d2ee96b661d51e1
Brad Ebinger [Wed, 22 Nov 2017 19:16:21 +0000 (19:16 +0000)]
Merge "Refactor ImsService to AIDL"
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
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
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
Hugo Benichi [Wed, 22 Nov 2017 05:08:50 +0000 (05:08 +0000)]
Merge "Light refactors to packet wakeup events."
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
Jonathan Basseri [Wed, 22 Nov 2017 01:51:46 +0000 (01:51 +0000)]
Merge "Javadoc cleanup of IpSecManager API."
am:
d09d106ec0
Change-Id: Iaf206b0980d3bed14fe6b8318d2073577212b460
Jonathan Basseri [Wed, 22 Nov 2017 01:32:06 +0000 (01:32 +0000)]
Merge "Javadoc cleanup of IpSecManager API."
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
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
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
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
Treehugger Robot [Tue, 21 Nov 2017 23:05:21 +0000 (23:05 +0000)]
Merge "Provide materials for Mobile network settings UI."
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
OSDN Git Service
