OSDN Git Service
yuemingw [Wed, 8 Nov 2017 19:54:54 +0000 (19:54 +0000)]
Merge "Add OWNED_BY field." am:
107141be5c am:
9c7be233c3
am:
592d620238
Change-Id: Ib023411485c971815f05e0b1e5894adbc725a6d8
yuemingw [Wed, 8 Nov 2017 19:45:14 +0000 (19:45 +0000)]
Merge "Add OWNED_BY field." am:
107141be5c
am:
9c7be233c3
Change-Id: Icf11a35867625a5a47450f5dc9a1b05ec00de502
yuemingw [Wed, 8 Nov 2017 19:36:44 +0000 (19:36 +0000)]
Merge "Add OWNED_BY field."
am:
107141be5c
Change-Id: Ib3ee22a0407881e6e7e754ea3504f5568c0ac31a
Treehugger Robot [Wed, 8 Nov 2017 19:28:37 +0000 (19:28 +0000)]
Merge "Add OWNED_BY field."
TreeHugger Robot [Wed, 8 Nov 2017 19:13:39 +0000 (19:13 +0000)]
Merge "Very initial field detection prototype."
nharold [Wed, 8 Nov 2017 18:46:41 +0000 (18:46 +0000)]
Merge "Fix signature for finalize() to resolve API Lint error" am:
c8ff280e73 am:
c09d405e1d
am:
f61308b9e4
Change-Id: I4b91b3b01ef24d43439bbc41bc8acaa7c690522b
Benedict Wong [Wed, 8 Nov 2017 18:27:06 +0000 (18:27 +0000)]
Merge "Update documentation for AES-GCM-ESP keymat length" am:
3db35dfcd5 am:
6491b03410
am:
d840f4d667
Change-Id: Ia0e1538feea2ddb0982875c925705c3648e50c8a
nharold [Wed, 8 Nov 2017 18:20:06 +0000 (18:20 +0000)]
Merge "Fix signature for finalize() to resolve API Lint error" am:
c8ff280e73
am:
c09d405e1d
Change-Id: I1f8915547876e0e0045724eb9a1e29123ab4edda
Benedict Wong [Wed, 8 Nov 2017 18:12:25 +0000 (18:12 +0000)]
Merge "Update documentation for AES-GCM-ESP keymat length" am:
3db35dfcd5
am:
6491b03410
Change-Id: I5e61a9c28dac49f2dca554ce2fdf755ab7be0dab
Evan Rosky [Wed, 8 Nov 2017 18:11:33 +0000 (18:11 +0000)]
Merge "Make PopupWindows into root namespaces"
nharold [Wed, 8 Nov 2017 18:11:20 +0000 (18:11 +0000)]
Merge "Fix signature for finalize() to resolve API Lint error"
am:
c8ff280e73
Change-Id: I1ad1ee6abafea702d9bb64f45ebad5ea307f25ec
TreeHugger Robot [Wed, 8 Nov 2017 18:09:12 +0000 (18:09 +0000)]
Merge "Fix the list of PROCESS_TEXT items in the toolbar."
Benedict Wong [Wed, 8 Nov 2017 18:02:53 +0000 (18:02 +0000)]
Merge "Update documentation for AES-GCM-ESP keymat length"
am:
3db35dfcd5
Change-Id: I71b24c9da8c677e35d05b6623eb99ec17f823b4b
nharold [Wed, 8 Nov 2017 17:56:43 +0000 (17:56 +0000)]
Merge "Fix signature for finalize() to resolve API Lint error"
Dake Gu [Wed, 8 Nov 2017 17:48:27 +0000 (17:48 +0000)]
Merge "convert Uibench test to aapt2"
Benedict Wong [Wed, 8 Nov 2017 17:47:40 +0000 (17:47 +0000)]
Merge "Update documentation for AES-GCM-ESP keymat length"
Brad Ebinger [Wed, 8 Nov 2017 17:40:17 +0000 (17:40 +0000)]
Merge "Move ImsServiceProxy to opt/net/ims" am:
b5d2f0c24f am:
6093305789
am:
fcec01f040
Change-Id: Ia27032259a31a585ac93ac90b8251af7d7e2f76d
Brad Ebinger [Wed, 8 Nov 2017 17:30:49 +0000 (17:30 +0000)]
Merge "Move ImsServiceProxy to opt/net/ims" am:
b5d2f0c24f
am:
6093305789
Change-Id: Ic1b21cd9a0fc906601bf37bf5e71aafdcbf0bd47
Andreas Gampe [Wed, 8 Nov 2017 17:24:16 +0000 (17:24 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared"" am:
f597ad5106 am:
41c52377ed
am:
1fb4c9a48a
Change-Id: If003333607b55f06bc6e2324464bf2195861278d
Brad Ebinger [Wed, 8 Nov 2017 17:21:53 +0000 (17:21 +0000)]
Merge "Move ImsServiceProxy to opt/net/ims"
am:
b5d2f0c24f
Change-Id: If8fbd0b2adf9f3f2f9a5d4a670b1e0bf1b445066
Brad Ebinger [Wed, 8 Nov 2017 17:12:44 +0000 (17:12 +0000)]
Merge "Move ImsServiceProxy to opt/net/ims"
Andreas Gampe [Wed, 8 Nov 2017 17:09:48 +0000 (17:09 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared"" am:
f597ad5106
am:
41c52377ed
Change-Id: I9058f70565327fe772b966a2fc3d55f187e267a2
Tobias Thierer [Wed, 8 Nov 2017 17:09:37 +0000 (17:09 +0000)]
Merge "Track deprecation/replacement of Os methods that depend on Mutable*" am:
e8b07e5bef am:
d20ae24fb1
am:
fbaf4253ae
Change-Id: I3116c759bc651e2fe4a93c17685d7f458d1d436e
Andreas Gampe [Wed, 8 Nov 2017 16:53:10 +0000 (16:53 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared""
am:
f597ad5106
Change-Id: I1d4f37c16ff9dfe8cdc998274d4e8b50e1987be7
Tobias Thierer [Wed, 8 Nov 2017 16:52:46 +0000 (16:52 +0000)]
Merge "Track deprecation/replacement of Os methods that depend on Mutable*" am:
e8b07e5bef
am:
d20ae24fb1
Change-Id: I275c4fb658f6c158d38a6062bf1622e239e1603c
Brad Ebinger [Wed, 8 Nov 2017 16:51:41 +0000 (16:51 +0000)]
Merge "Switch class hierarchy of ImsServiceProxy and compat" am:
7805de4002 am:
90f22d4bf6
am:
e288472122
Change-Id: Icde853dde9257a0314b0ebe1619edb7eb55d216d
TreeHugger Robot [Wed, 8 Nov 2017 16:47:52 +0000 (16:47 +0000)]
Merge "WifiInfo: Documentation for change of SSID formatting"
Tobias Thierer [Wed, 8 Nov 2017 16:44:30 +0000 (16:44 +0000)]
Merge "Track deprecation/replacement of Os methods that depend on Mutable*"
am:
e8b07e5bef
Change-Id: Iebebb843f0857cad4ace13731d1f066ab84eabb6
Brad Ebinger [Wed, 8 Nov 2017 16:37:36 +0000 (16:37 +0000)]
Merge "Switch class hierarchy of ImsServiceProxy and compat" am:
7805de4002
am:
90f22d4bf6
Change-Id: I227b081551539e4299f63c304a4e27d9be2070c7
Treehugger Robot [Wed, 8 Nov 2017 16:36:59 +0000 (16:36 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared""
Tobias Thierer [Wed, 8 Nov 2017 16:34:03 +0000 (16:34 +0000)]
Merge "Track deprecation/replacement of Os methods that depend on Mutable*"
Brad Ebinger [Wed, 8 Nov 2017 16:30:27 +0000 (16:30 +0000)]
Merge "Switch class hierarchy of ImsServiceProxy and compat"
am:
7805de4002
Change-Id: I0ec39abb8006c7b29b449a59c7408a97549671f0
Brad Ebinger [Wed, 8 Nov 2017 16:20:39 +0000 (16:20 +0000)]
Merge "Switch class hierarchy of ImsServiceProxy and compat"
TreeHugger Robot [Wed, 8 Nov 2017 15:07:35 +0000 (15:07 +0000)]
Merge "Remove dnd, expand, alarm stream from volume dlg"
Richard Ledley [Wed, 8 Nov 2017 13:35:21 +0000 (13:35 +0000)]
Merge "Initial implementation of generateLinks"
yuemingw [Wed, 8 Nov 2017 13:12:18 +0000 (13:12 +0000)]
Add OWNED_BY field.
Bug:
68208199
Test: later
Design doc: https://docs.google.com/document/d/1UEYjhRGSEwwccPLs_FzFD-IeOsVq63gxmAHNtDfnzAY/edit#heading=h.jza6dz6kh6bz
Change-Id: Ic78df7902523bad4b3d40bacb73b17d767226aac
TreeHugger Robot [Wed, 8 Nov 2017 12:26:51 +0000 (12:26 +0000)]
Merge "Fixes javadoc documentation of PackageInstaller.SessionParams#setOriginatingUid(int)"
Richard Ledley [Thu, 5 Oct 2017 09:52:19 +0000 (10:52 +0100)]
Initial implementation of generateLinks
Test: Included, and ag/
3141575
Change-Id: Ia91aa130e95ff347c55981b68b8d975bc8131a73
yuemingw [Tue, 7 Nov 2017 15:19:45 +0000 (15:19 +0000)]
Fix cts failure for com.android.cts.devicepolicy.ManagedProfileTest#testParentProfileApiDisabled
Change-Id: Iba6078f06d7d251a12c530058d1f2ace78aa3e92
Fix:
68954948
Test: com.android.cts.devicepolicy.ManagedProfileTest#testParentProfileApiDisabled
TreeHugger Robot [Wed, 8 Nov 2017 09:03:07 +0000 (09:03 +0000)]
Merge "Added new update engine error codes from /android/system/update_engine/common/error_code.h"
Hugo Benichi [Wed, 8 Nov 2017 06:57:00 +0000 (06:57 +0000)]
Merge "Define MacAddress class" am:
925349ac8f am:
37caaaa705
am:
76c2cd2a6a
Change-Id: I0e09e64bb2a6306c0422443038351fabf10e2d6e
Hugo Benichi [Wed, 8 Nov 2017 06:46:49 +0000 (06:46 +0000)]
Merge "Define MacAddress class" am:
925349ac8f
am:
37caaaa705
Change-Id: I377de35ab9ce9d8bf44bd90295a2a41fbea06d7a
Hugo Benichi [Wed, 8 Nov 2017 06:39:40 +0000 (06:39 +0000)]
Merge "Define MacAddress class"
am:
925349ac8f
Change-Id: If270c17b1b763e302b848fba2fe4660ce5929018
Hugo Benichi [Wed, 8 Nov 2017 06:30:04 +0000 (06:30 +0000)]
Merge "Define MacAddress class"
TreeHugger Robot [Wed, 8 Nov 2017 04:24:52 +0000 (04:24 +0000)]
Merge "Implement getMinLineWidth for LineWidthDelegate"
Hugo Benichi [Wed, 8 Nov 2017 03:56:40 +0000 (03:56 +0000)]
Merge "Networking metrics: minor pretty printing improvements" am:
ee56b4a65c am:
5480314039
am:
2e2763f067
Change-Id: I5c3d7acf4765daaa31b593f8cb51566de6cf89c5
Hugo Benichi [Wed, 8 Nov 2017 03:48:40 +0000 (03:48 +0000)]
Merge "Networking metrics: minor pretty printing improvements" am:
ee56b4a65c
am:
5480314039
Change-Id: I26ec8ca2d10eb5071de701043f60b67bcfbf7ba5
Hugo Benichi [Wed, 8 Nov 2017 03:39:55 +0000 (03:39 +0000)]
Merge "Networking metrics: minor pretty printing improvements"
am:
ee56b4a65c
Change-Id: I5a19824564a56881ffe0ea72556490c71c0d9c23
Treehugger Robot [Wed, 8 Nov 2017 03:27:25 +0000 (03:27 +0000)]
Merge "Networking metrics: minor pretty printing improvements"
TreeHugger Robot [Wed, 8 Nov 2017 03:26:53 +0000 (03:26 +0000)]
Merge "Migrate all remaining MetricProducers to use ProtoOutputStream"
TreeHugger Robot [Wed, 8 Nov 2017 03:22:35 +0000 (03:22 +0000)]
Merge "Expose SmsManager#sendTextMessageWithoutPersisting as a public API"
Dake Gu [Wed, 8 Nov 2017 02:50:29 +0000 (18:50 -0800)]
convert Uibench test to aapt2
Bug: NA
Test: build
Change-Id: Ibe70c6c15d8f72d40b1d6c2c43872d02a0bdb872
TreeHugger Robot [Wed, 8 Nov 2017 03:05:42 +0000 (03:05 +0000)]
Merge "Fix test breakage in settingslib"
TreeHugger Robot [Wed, 8 Nov 2017 02:56:52 +0000 (02:56 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 8 Nov 2017 02:47:56 +0000 (02:47 +0000)]
Merge "Fix a11y shortcut"
Andreas Gampe [Wed, 8 Nov 2017 02:21:58 +0000 (02:21 +0000)]
Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared"
This reverts commit
e131dac848cb4d0998e1dee2219382250c71d277.
Reason for revert: ART default properties are now in /system.
Bug:
68755013
Change-Id: I32d938abb73c8d8df74716ede8032d9874086fda
TreeHugger Robot [Wed, 8 Nov 2017 02:21:56 +0000 (02:21 +0000)]
Merge "Use enum class for FontVariation and update MinikinUtils"
TreeHugger Robot [Wed, 8 Nov 2017 02:18:10 +0000 (02:18 +0000)]
Merge "Access already-read descriptors on device connect. (Eliminate extra read)"
TreeHugger Robot [Wed, 8 Nov 2017 02:14:05 +0000 (02:14 +0000)]
Merge "Fix NPE notifyActivityPinned"
Hugo Benichi [Thu, 12 Oct 2017 12:33:40 +0000 (21:33 +0900)]
Define MacAddress class
Test: new unit tests part of $ runtest frameworks-net
Change-Id: I5a6a868ff86e9bffdc551d4e2bb486b585525c30
TreeHugger Robot [Wed, 8 Nov 2017 02:01:25 +0000 (02:01 +0000)]
Merge changes I37d55b60,I350ec45b
* changes:
Fixes connecting to service after setup finishes for other users
Fixes service disconnect crash when changing users
Nathan Harold [Wed, 8 Nov 2017 01:17:45 +0000 (17:17 -0800)]
Fix signature for finalize() to resolve API Lint error
The API linter on goog/master noticed that this method is
listed in the public API even though it's protected. The
change is probably related to a signature change from the
internal finalize method which throws a Throwable. Fix the
method in IpSecManager to throw Throwable, which should
fix the current.txt and resolve the lint error.
Bug:
69006767
Test: compilation, make update-api
Change-Id: I173d014baaa505c365b7916fcb52f2a8b4af9373
Benedict Wong [Thu, 2 Nov 2017 00:14:25 +0000 (17:14 -0700)]
Update documentation for AES-GCM-ESP keymat length
Added notes that keymat length must include 32 bits of salt.
Bug:
68672051
Test: Frameworks-net unit tests & IpSecManager CTS tests run
Change-Id: I0ae0c5be8a45b2374783b3bd1fa8bf930f15e687
Adam Vartanian [Wed, 8 Nov 2017 01:39:17 +0000 (01:39 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333 am:
49dfdd66cc am:
eb4598afba am:
a2149abe3a am:
560fb5d050 am:
2edd31e7fc am:
97ff9f9d27
am:
580feb2e37
Change-Id: I009e5d8a7b32705f3ac01f989b4e68b5fa5664ef
yro [Mon, 6 Nov 2017 22:27:31 +0000 (14:27 -0800)]
Migrate all remaining MetricProducers to use ProtoOutputStream
Test: statsd, statsd_test
Change-Id: I1087e1c1ffb372ca288dfc575cb7a372b11ce8c5
Adam Vartanian [Wed, 8 Nov 2017 01:13:26 +0000 (01:13 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333 am:
49dfdd66cc am:
eb4598afba am:
a2149abe3a am:
560fb5d050 am:
2edd31e7fc
am:
97ff9f9d27
Change-Id: Ied66e9bfef6708e0c03b0f97240e3a4b67780ddf
Hugo Benichi [Tue, 7 Nov 2017 12:42:10 +0000 (21:42 +0900)]
Networking metrics: minor pretty printing improvements
Bug:
65700460
Test: manually verified the output of $ adb shell dumpsys connmetrics
Change-Id: Ieae535b48d2e2b6e9087431d345c8f916006bb6c
Phil Weaver [Wed, 8 Nov 2017 00:39:19 +0000 (16:39 -0800)]
Fix a11y shortcut
Adding a default value when checking settings.
Bug:
68765076
Test: Now able to activate shortcut.
Change-Id: Ic648249dae042dd318301d0659cb4de4cc719ff6
Adam Vartanian [Wed, 8 Nov 2017 00:38:27 +0000 (00:38 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333 am:
49dfdd66cc am:
eb4598afba am:
a2149abe3a am:
560fb5d050
am:
2edd31e7fc
Change-Id: Ic915bece1025d8ad8a0ed05e9b20afa9bfcdd811
TreeHugger Robot [Wed, 8 Nov 2017 00:20:40 +0000 (00:20 +0000)]
Merge "AAPT2: Better debugging output"
Adam Vartanian [Wed, 8 Nov 2017 00:15:23 +0000 (00:15 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333 am:
49dfdd66cc am:
eb4598afba am:
a2149abe3a
am:
560fb5d050
Change-Id: I088a828022a70b0d2ac1b88c4fab3801528eb4f8
Adam Vartanian [Tue, 7 Nov 2017 23:50:35 +0000 (23:50 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333 am:
49dfdd66cc am:
eb4598afba
am:
a2149abe3a
Change-Id: I48d611e91318a8f85f12fcff5fc00de8b1f834c9
Matthew Ng [Tue, 7 Nov 2017 23:46:51 +0000 (15:46 -0800)]
Fixes connecting to service after setup finishes for other users
Changed event to connect to launcher service using onUserSetupChanged
instead of onDeviceProvisionedChanged since it does not run when other
users finish setup wizard.
Test: manual - create new user and finish setup, check connection status
Change-Id: I37d55b6089ebddb0bd2ab9e5d0e0bb3fa8d73948
Fixes:
68994491
TreeHugger Robot [Tue, 7 Nov 2017 23:44:51 +0000 (23:44 +0000)]
Merge "Introduce write lock for mDragState"
Adam Vartanian [Tue, 7 Nov 2017 23:30:44 +0000 (23:30 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333 am:
49dfdd66cc
am:
eb4598afba
Change-Id: Ibf435bc90e013af2a7c72f1988ac0f78485f2c23
jackqdyulei [Tue, 7 Nov 2017 22:24:49 +0000 (14:24 -0800)]
Fix test breakage in settingslib
If we bump up the API level to 26 in settingslib robo tests,
BatteryMeterDrawableBaseTest has test failure.
This cl fix it by inject to the critical level and bump up API
level.
Bug:
69001622
Test: RunSettingsLibRoboTests
Change-Id: I1b70d9ac23be000efbaed3edcef912e6787ebc5c
Hugo Benichi [Tue, 7 Nov 2017 23:22:39 +0000 (23:22 +0000)]
Merge "Refactor ApfFilter creation" am:
5e619dce66 am:
6c25e1e24d
am:
55939f351b
Change-Id: Iff87d6efa0bb55c84e852a84489a0218acd21100
Adam Vartanian [Tue, 7 Nov 2017 23:04:25 +0000 (23:04 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333
am:
49dfdd66cc
Change-Id: I49d0744049b593ea47ede3ad9e128a5344196811
Roozbeh Pournader [Tue, 7 Nov 2017 21:06:34 +0000 (13:06 -0800)]
Implement getMinLineWidth for LineWidthDelegate
Minikin needs getMinLineWidth() implemented for supporting desperate
breaks in optimal line breaking. This CL implements it for
StaticLayout.
Bug:
68058572
Test: bit CtsTextTestCases:android.text.cts.StaticLayoutLineBreakingTest
Change-Id: I56f6a592c688d816c201279d35fad65e36dffd84
Hugo Benichi [Tue, 7 Nov 2017 22:53:09 +0000 (22:53 +0000)]
Merge "Refactor ApfFilter creation" am:
5e619dce66
am:
6c25e1e24d
Change-Id: I3f406b08287092d4e2bc23f158693cea6f6646e4
TreeHugger Robot [Tue, 7 Nov 2017 22:52:39 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 7 Nov 2017 22:51:37 +0000 (22:51 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 7 Nov 2017 22:49:02 +0000 (22:49 +0000)]
Merge "Refactor AccessPointPreference"
Hugo Benichi [Tue, 7 Nov 2017 22:42:10 +0000 (22:42 +0000)]
Merge "Refactor ApfFilter creation"
am:
5e619dce66
Change-Id: I0be4951cf3feafc94564fad436dec3e8bfceddc4
Adam Vartanian [Tue, 7 Nov 2017 22:41:48 +0000 (22:41 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21
am:
f61daaa333
Change-Id: Iee679fb3a115f6c1a2683905e5b392ec665aee33
Hugo Benichi [Tue, 7 Nov 2017 22:22:19 +0000 (22:22 +0000)]
Merge "Refactor ApfFilter creation"
Seigo Nonaka [Thu, 26 Oct 2017 23:02:01 +0000 (16:02 -0700)]
Use enum class for FontVariation and update MinikinUtils
This CL contains followins:
- Use enum class FontVariation instead of legacy enum.
- Store FontStyle in MinikinPaint.
Bug:
65024629
Test: minikin_tests
Change-Id: I86bf64fd5d9a8c08eff47db851fa4655da84b1e4
Adam Vartanian [Tue, 7 Nov 2017 22:12:09 +0000 (22:12 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c
am:
3ac5dabc21
Change-Id: I43fbad45f90ec2d1fb48fecbd2d73a05f39730a9
Fyodor Kupolov [Tue, 7 Nov 2017 22:04:26 +0000 (22:04 +0000)]
Merge "Revert "Fix StrictMode I/O violations""
TreeHugger Robot [Tue, 7 Nov 2017 21:58:00 +0000 (21:58 +0000)]
Merge "WifiService: Enforce permission for enableVerboseLogging"
Adam Vartanian [Tue, 7 Nov 2017 21:56:10 +0000 (21:56 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362
am:
240b55de2c
Change-Id: Ie3d378e8d9aeaff6f45838ebe988a5799f6acf3b
Adam Vartanian [Tue, 7 Nov 2017 21:41:55 +0000 (21:41 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e
am:
49e5fca362
Change-Id: Id6f38542623d768bebcfae7e79e8e49450329037
Wale Ogunwale [Tue, 7 Nov 2017 21:20:53 +0000 (13:20 -0800)]
Fix NPE notifyActivityPinned
It is possible an activity is removed from it task before the
notifyActivityPinned call is processed. To avoid this we now add the
relevant information to the message before posting.
Change-Id: Ib65dee1db3033568d2385703edc92ca4bfd12549
Fixes:
68918788
Test: go/wm-smoke
Adam Vartanian [Tue, 7 Nov 2017 21:29:27 +0000 (21:29 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3
am:
eee677386e
Change-Id: Ifd94d94c5376a6b4f1174aa7c2c8bb6d40199d89
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"
Test: none
Change-Id: I90410ed3393b5c37afdf0476eb70821fae9f63fd
TreeHugger Robot [Tue, 7 Nov 2017 21:09:46 +0000 (21:09 +0000)]
Merge "Expose EXTRA_SUB_ID."
Adam Vartanian [Tue, 7 Nov 2017 21:02:07 +0000 (21:02 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814
am:
4158c9fbf3
Change-Id: I61bc0f5471d8f7a9a59136f320d465f2ee81b518
Adam Vartanian [Tue, 7 Nov 2017 20:51:02 +0000 (20:51 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37
am:
6a9c7c4814
Change-Id: I80bedf58833511d336839df9f17daf65cfebfacf
Adam Vartanian [Tue, 7 Nov 2017 20:41:28 +0000 (20:41 +0000)]
Adjust Uri host parsing to use last instead of first @.
am:
cd6228dd37
Change-Id: I5db66a5a2073acaffe0560999c914a78df362c51
Roshan Pius [Mon, 30 Oct 2017 21:54:45 +0000 (14:54 -0700)]
WifiInfo: Documentation for change of SSID formatting
The getSSID() method used to return a string with no quotes before
Android J, so add documentation mentioning when this was changed.
Bug:
12957620
Test: Compiles & verified that the docs are updated (make
doc-comment-check-docs).
Change-Id: I5d3713303c8f8c5c09d74ad1c5b8398107847b87
OSDN Git Service
