OSDN Git Service
Nathan Harold [Wed, 5 Apr 2017 17:15:04 +0000 (10:15 -0700)]
Fix Log Traces for IpSecService
Bug:
36920223
Test: boot and see full log
Change-Id: I1ac53f172094082c53b53a950058c862d257b7e5
(cherry picked from commit
d3e3f1593a523d488c76be2494d94a399e52dc9d)
(cherry picked from commit
a8a74e25ddb27a350c8f643590639b9131fae2e1)
Wei Wang [Wed, 5 Apr 2017 05:00:01 +0000 (22:00 -0700)]
SystemServer: fix StartIpSecService trace and log
Bug:
36920223
Test: boot and see log
Change-Id: I9b88564ac7eef6998af465b977fa66c7d0787cf2
(cherry picked from commit
90f4c0907e8f746f0f840e76057f84ec20adf46d)
(cherry picked from commit
75ed75c3d7af90f1b3275a126bdce847adcd7b35)
Santos Cordon [Thu, 6 Apr 2017 02:00:29 +0000 (02:00 +0000)]
Merge "Remove SystemProperty gating-flag for virtual displays." into oc-dev
am:
54d488d4b7
Change-Id: Ieb9560aafff93e61bffc870d81364cfa98e85234
Christopher Tate [Thu, 6 Apr 2017 01:59:27 +0000 (01:59 +0000)]
Merge "Don't call the Package Manager when holding the settings lock" into oc-dev
am:
781fdfaf5b
Change-Id: Iec1e4b48ce9191e6b2f2ae56e144518698e51f3d
Nathan Harold [Thu, 6 Apr 2017 01:56:16 +0000 (01:56 +0000)]
Merge changes from topic 'ipsec-svc-pick' into oc-dev
am:
b077f6abd3 -s ours
Change-Id: Iea4a23356643415390322a53a547f7194bb2cafa
Santos Cordon [Thu, 6 Apr 2017 01:48:06 +0000 (01:48 +0000)]
Merge "Remove SystemProperty gating-flag for virtual displays." into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 01:41:47 +0000 (01:41 +0000)]
Merge "Don't call the Package Manager when holding the settings lock" into oc-dev
Nathan Harold [Thu, 6 Apr 2017 01:34:32 +0000 (01:34 +0000)]
Merge changes from topic 'ipsec-svc-pick' into oc-dev
* changes:
Fix Log Traces for IpSecService
SystemServer: fix StartIpSecService trace and log
Add Initial IPsec APIs to IpSecService
IpSecManager and IpSecTransform API Cleanup
Change reserveSecurityParameterIndex() to take a remoteAddress
Add a Skeleton IpSecService
George Mount [Thu, 6 Apr 2017 01:21:01 +0000 (01:21 +0000)]
Merge "Save FragmentManagerNonConfig during onSaveInstanceState()" into oc-dev
am:
fade53591b
Change-Id: Iab983407193984f72f5ecbc485082f4ca1ec70f7
Jack Yu [Thu, 6 Apr 2017 01:15:00 +0000 (01:15 +0000)]
Merge "Fixed the obsolete logging" into oc-dev
am:
93c2c94c19
Change-Id: I264afd9b0f5ab4a7c1e40467c40f285749b87600
TreeHugger Robot [Thu, 6 Apr 2017 01:13:06 +0000 (01:13 +0000)]
Merge "Save FragmentManagerNonConfig during onSaveInstanceState()" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 01:05:01 +0000 (01:05 +0000)]
Merge "Fixed the obsolete logging" into oc-dev
Felipe Leme [Thu, 6 Apr 2017 00:25:05 +0000 (00:25 +0000)]
Merge "Created SaveInfo types for email and username." into oc-dev
am:
aaca304a31
Change-Id: I3e6275bf70d75b4921be40bc6a9820d2fcae8a2a
George Mount [Thu, 6 Apr 2017 00:22:01 +0000 (00:22 +0000)]
Merge "Change getFragments() to return a List." into oc-dev
am:
1b2bedcd76
Change-Id: I59407dbe9e307e30bb721e33423130615ff00a7c
TreeHugger Robot [Thu, 6 Apr 2017 00:15:23 +0000 (00:15 +0000)]
Merge "Created SaveInfo types for email and username." into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 00:13:22 +0000 (00:13 +0000)]
Merge "Change getFragments() to return a List." into oc-dev
Peng Xu [Thu, 6 Apr 2017 00:11:52 +0000 (00:11 +0000)]
Merge "Local geomagnetic field update to sensor" into oc-dev
am:
33bbdda3d3
Change-Id: I3c450d9d16a998918bc3963ad624455d6e2bb361
Adam Bookatz [Thu, 6 Apr 2017 00:07:54 +0000 (00:07 +0000)]
Merge "Change wifiScanActualTime csv from usec to msec" into oc-dev
am:
a63e911ad2
Change-Id: Ifedca603373f50c55a4030837728c757c5b9af93
Felipe Leme [Thu, 6 Apr 2017 00:06:43 +0000 (00:06 +0000)]
Merge "Dump autofill service component from settings." into oc-dev
am:
d3ed35f690
Change-Id: I5391e2d13d3555310e6a3e8f23f95aa4389b9aaf
Christopher Tate [Wed, 5 Apr 2017 23:34:07 +0000 (16:34 -0700)]
Don't call the Package Manager when holding the settings lock
The package manager sometimes has to call into the settings provider with
its own lock held in the course of processing queries, so it's vitally
important not to call into it with the settings provider's internal lock
already held.
In this case, the SSAID lazy-generation path was fetching the signatures
of the calling package from inside the settings lock. Now it doesn't.
Bug
36863412
Test: manual
Change-Id: Ic9d53397b5bddb883c5d73aff253ca280a5e93c0
Peng Xu [Thu, 6 Apr 2017 00:00:07 +0000 (00:00 +0000)]
Merge "Local geomagnetic field update to sensor" into oc-dev
Adam Bookatz [Wed, 5 Apr 2017 23:56:56 +0000 (23:56 +0000)]
Merge "Change wifiScanActualTime csv from usec to msec" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 23:56:21 +0000 (23:56 +0000)]
Merge "Dump autofill service component from settings." into oc-dev
Chad Brubaker [Wed, 5 Apr 2017 23:51:51 +0000 (23:51 +0000)]
Merge "Serialize visibleToInstantApps" into oc-dev
am:
63cb740b4f
Change-Id: I58ab558cf6fea9144f100aa6bce8437f91b9e31a
TreeHugger Robot [Wed, 5 Apr 2017 23:44:56 +0000 (23:44 +0000)]
Merge "Serialize visibleToInstantApps" into oc-dev
Winson Chung [Wed, 5 Apr 2017 23:44:50 +0000 (23:44 +0000)]
Merge "Workaround for input ANR, always finish PiP menu activity." into oc-dev
am:
c9fa6399f2
Change-Id: I387739e284275fe8a857a567c596175a81deaad8
Selim Cinek [Wed, 5 Apr 2017 23:43:39 +0000 (23:43 +0000)]
Merge "Fixed that the icon could dissappear" into oc-dev
am:
58b39a1f87
Change-Id: If6661055678351da6031f92b6a5ec90772983f7a
Roozbeh Pournader [Wed, 5 Apr 2017 23:42:32 +0000 (23:42 +0000)]
Merge "Use text input for various internationalized listeners" into oc-dev
am:
94b6b532c0
Change-Id: I38faf86ec475154d437cc7dc7a363d58fd5962da
Dmitry Dementyev [Wed, 5 Apr 2017 23:41:22 +0000 (23:41 +0000)]
Merge "Don't show empty account list in account chooser." into oc-dev
am:
6343bd8ffc
Change-Id: I64110a80d61e66876dd332ab01c8757a0beca082
Winson Chung [Wed, 5 Apr 2017 23:36:30 +0000 (23:36 +0000)]
Merge "Workaround for input ANR, always finish PiP menu activity." into oc-dev
Selim Cinek [Wed, 5 Apr 2017 23:35:54 +0000 (23:35 +0000)]
Merge "Fixed that the icon could dissappear" into oc-dev
George Mount [Wed, 5 Apr 2017 23:34:30 +0000 (23:34 +0000)]
Merge "Call noteStateNotSaved on child fragment managers." into oc-dev
am:
a62a3d8ec1
Change-Id: I2a7a54b69c69efaf27a2edd18e2adbb179e660b2
TreeHugger Robot [Wed, 5 Apr 2017 23:32:50 +0000 (23:32 +0000)]
Merge "Use text input for various internationalized listeners" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 23:29:22 +0000 (23:29 +0000)]
Merge "Don't show empty account list in account chooser." into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 23:23:50 +0000 (23:23 +0000)]
Merge "Call noteStateNotSaved on child fragment managers." into oc-dev
Todd Kennedy [Wed, 5 Apr 2017 23:16:49 +0000 (23:16 +0000)]
Merge "don't honour domain verification for browsers" into oc-dev
am:
154836844d
Change-Id: I19aefccde8a1f72edf2dff97e9d534f903187d47
TreeHugger Robot [Wed, 5 Apr 2017 23:11:38 +0000 (23:11 +0000)]
Merge "don't honour domain verification for browsers" into oc-dev
Felipe Leme [Wed, 5 Apr 2017 22:34:13 +0000 (22:34 +0000)]
Merge "Changed FillResponse.setAuthentication() to require field ids." into oc-dev
am:
a9baa4c851
Change-Id: I59736bcc35281b038bcb19b822cb00b44cac2a60
Felipe Leme [Wed, 5 Apr 2017 22:25:08 +0000 (22:25 +0000)]
Merge "Changed FillResponse.setAuthentication() to require field ids." into oc-dev
Bookatz [Wed, 5 Apr 2017 22:23:15 +0000 (22:23 +0000)]
Merge "Collect background stats: scheduled jobs" into oc-dev
am:
f68766f666
Change-Id: I5123fabe0976652cecf31fa3c786fa4f10a4e1dc
Calin Juravle [Wed, 5 Apr 2017 22:16:41 +0000 (22:16 +0000)]
Merge "Fix dex flags for secondary dex files" into oc-dev
am:
b0baef0715
Change-Id: I48edc46788a091448ef142adfb6ceabc5f1be87f
TreeHugger Robot [Wed, 5 Apr 2017 22:13:05 +0000 (22:13 +0000)]
Merge "Collect background stats: scheduled jobs" into oc-dev
Calin Juravle [Wed, 5 Apr 2017 22:07:48 +0000 (22:07 +0000)]
Merge "Fix dex flags for secondary dex files" into oc-dev
Bryce Lee [Wed, 5 Apr 2017 21:59:25 +0000 (21:59 +0000)]
Merge "Remove accidental debugger wait." into oc-dev
am:
3157927652
Change-Id: Ic9013b21893803ffdf2fb7b156fb061f4c2c2321
Jack Yu [Wed, 5 Apr 2017 21:12:09 +0000 (14:12 -0700)]
Fixed the obsolete logging
Added missing logging messages and removed legacy codes.
Test: adb bugreport
bug:
33041058
Change-Id: I38ec1aeb14ba4bf5b0e7df2aea45dcbd1bb3ff7f
Bryce Lee [Wed, 5 Apr 2017 21:55:12 +0000 (21:55 +0000)]
Merge "Remove accidental debugger wait." into oc-dev
Jeremy Joslin [Wed, 5 Apr 2017 21:53:39 +0000 (21:53 +0000)]
Merge "Restore @VisibleForTesting on NetworkScorerAppManager." into oc-dev
am:
4734737329
Change-Id: I1cf133271cc405178d2562f7a38299948c689e86
Felipe Leme [Wed, 5 Apr 2017 21:46:50 +0000 (14:46 -0700)]
Dump autofill service component from settings.
Bug:
36978445
Test: manual verification
Change-Id: I30992452c94a78c05a5a98e94d5ffc5325151a76
Bryce Lee [Wed, 5 Apr 2017 21:49:44 +0000 (14:49 -0700)]
Remove accidental debugger wait.
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStackSupervisorTests
Change-Id: I129b139a14d925221f2c9b614f45aedac1f153b5
Phil Weaver [Wed, 5 Apr 2017 21:48:55 +0000 (21:48 +0000)]
Merge "Consolidate a11y unit tests and get them working" into oc-dev
am:
101b151548
Change-Id: Iae2179b65f758779979e15937c9a0c6b6f6efa4b
TreeHugger Robot [Wed, 5 Apr 2017 21:48:06 +0000 (21:48 +0000)]
Merge "Restore @VisibleForTesting on NetworkScorerAppManager." into oc-dev
Roozbeh Pournader [Wed, 5 Apr 2017 21:47:49 +0000 (21:47 +0000)]
Merge "Revert "Use KB instead of kB."" into oc-dev
am:
e389f00d7f
Change-Id: I9eadb724b353f1df6c8654fedeb76dfcf22d4ed6
Todd Kennedy [Wed, 5 Apr 2017 21:42:33 +0000 (21:42 +0000)]
Merge "don't log non-instant app resolutions" into oc-dev
am:
f2e4e8ba90
Change-Id: I56342b8ec2b84855f8212d7ffc6f772c08b2b44a
TreeHugger Robot [Wed, 5 Apr 2017 21:41:24 +0000 (21:41 +0000)]
Merge "Consolidate a11y unit tests and get them working" into oc-dev
Roozbeh Pournader [Wed, 5 Apr 2017 21:39:10 +0000 (21:39 +0000)]
Merge "Revert "Use KB instead of kB."" into oc-dev
Todd Kennedy [Wed, 5 Apr 2017 21:36:37 +0000 (21:36 +0000)]
Merge "don't log non-instant app resolutions" into oc-dev
Jorim Jaggi [Wed, 5 Apr 2017 21:35:05 +0000 (21:35 +0000)]
Merge "Check for null when updating header" into oc-dev
am:
010484f7c3
Change-Id: I902a5339f0d62ff14e2f9aa43eae7036d98c45e1
Sundeep Ghuman [Wed, 5 Apr 2017 21:33:31 +0000 (21:33 +0000)]
Merge "Create Espresso test for WifiSettings." into oc-dev
am:
0d47527058
Change-Id: I3691a2b57b36fc42f706f537e5274c59bb1c403d
Jorim Jaggi [Wed, 5 Apr 2017 21:29:55 +0000 (21:29 +0000)]
Merge "Check for null when updating header" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 21:27:36 +0000 (21:27 +0000)]
Merge "Create Espresso test for WifiSettings." into oc-dev
Todd Kennedy [Wed, 5 Apr 2017 21:15:00 +0000 (14:15 -0700)]
don't honour domain verification for browsers
When a default browser is set, we change its domain verification status
to "INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS". This change is
global and permanent; it affects all URLs and won't be cleared by
resetting the browser's domain handling in settings.
To properly handle this, we don't pay attention to the domain verification
status for "browser" applications when we determine whether or not to
offer an instant app.
Change-Id: I1e2766e9856b0c9d3276e33a8db10195c72ae6ea
Fixes:
36978307
Test: Install firefox, start a browser intent [from command line], select chrome and choose "use always", start another browser intent that resolves to an instant app, see that ephemeral apps still resolve
Tobias Thierer [Wed, 5 Apr 2017 21:14:46 +0000 (21:14 +0000)]
Merge "Document the fact that StatFs.restat() and ctor can throw." am:
183c93f6a0 am:
e11ed001dd
am:
a426851da0
Change-Id: Ife49443ed8e5e4e90723e4e46c0e8c48a6ee5547
Roozbeh Pournader [Wed, 5 Apr 2017 21:13:22 +0000 (21:13 +0000)]
Revert "Use KB instead of kB."
This reverts commit
8ebf40498f00cdb789b92b9394e69844f5df4e3a.
Bug:
27672362
Bug:
36496960
Change-Id: Id04623a400c30f3c9b218806c118c5e4ffada020
Tobias Thierer [Wed, 5 Apr 2017 21:09:14 +0000 (21:09 +0000)]
Merge "Document the fact that StatFs.restat() and ctor can throw." am:
183c93f6a0
am:
e11ed001dd
Change-Id: Ia2ee1c65e6cd7992d0761a7eeb6e9bb7964de3bc
Roozbeh Pournader [Thu, 16 Feb 2017 02:19:09 +0000 (18:19 -0800)]
Use text input for various internationalized listeners
Since the characters that need to be entered for an internationalized
input type may not be available on the old non-internationalized
layouts, switch to the full text layout if there are any such
characters.
TextView is also modified to call the locale-aware listeners if
the target SDK is set to O or later.
Test: Manual
Bug: https://code.google.com/p/android/issues/detail?id=2626
Bug: https://code.google.com/p/android/issues/detail?id=82993
Bug:
8319249
Bug:
33276673
Bug:
34394455
Change-Id: I544bf0cc893a475ab5bf88cbad01cb981c6fef91
Tobias Thierer [Wed, 5 Apr 2017 21:03:42 +0000 (21:03 +0000)]
Merge "Document the fact that StatFs.restat() and ctor can throw."
am:
183c93f6a0
Change-Id: I0c8a4c12495260044be6aac74a505280498a9b44
George Mount [Wed, 5 Apr 2017 20:56:37 +0000 (13:56 -0700)]
Change getFragments() to return a List.
Bug
36762718
Bug
36982279
Changes getFragments() to return a List instead of a Collection.
The order is the order in which the fragment is added or attached.
Test: ran fragment cts tests
Change-Id: I10bbeef13e9154bbe052127cfa0e160b2e500b4d
Tobias Thierer [Wed, 5 Apr 2017 20:53:46 +0000 (20:53 +0000)]
Merge "Document the fact that StatFs.restat() and ctor can throw."
Tenghui Zhu [Wed, 5 Apr 2017 20:52:32 +0000 (20:52 +0000)]
Merge "Make sure we handle the matrix separately for non-invertable matrix" into oc-dev
am:
399dba4ab0
Change-Id: I9ff2b46f5b06f5092e4aaca348aa021f870c7c6f
Tobias Thierer [Tue, 2 Aug 2016 15:41:11 +0000 (16:41 +0100)]
Document the fact that StatFs.restat() and ctor can throw.
StatFs.restat() and the StatFs constructor can throw
IllegalArgumentException. This was not previously documented;
not all callers took this into account, for example:
http://r.android.com/251290
This CL adds documentation to those methods. It also adds
comments to two of the callers.
Separately from this CL, we may in addition consider adding
new API StatFs.checkedRestat() and StatFs.checkedCreate()
or similar that throw IOException; we cannot change the
existing constructor and method since they are public.
Test: Checked that "make" still completed successfully.
Change-Id: I6a0b3cb7718939408937c61de7c3b000b948fa59
Christopher Tate [Wed, 5 Apr 2017 20:51:16 +0000 (20:51 +0000)]
Merge "Allow background default container service in a less crashy way" into oc-dev
am:
0283544c49
Change-Id: I863c9c8ae1d3760eb68d7169b8d60260731d6190
Adam Lesinski [Wed, 5 Apr 2017 20:50:14 +0000 (20:50 +0000)]
Merge "AAPT2: Fix pseudolocalization (again)" into oc-dev
am:
448727bdae
Change-Id: I7cb95f9fa3a92ad342a807660e8a415ca9f4fe41
Adam Lesinski [Wed, 5 Apr 2017 20:49:06 +0000 (20:49 +0000)]
Merge "Fix NPE when adding WebView to ResourcesManager" into oc-dev
am:
7e5205137c
Change-Id: Ifb45086ba1c53e4de5abe83de66118e026c3c297
Dianne Hackborn [Wed, 5 Apr 2017 20:47:54 +0000 (20:47 +0000)]
Merge "Work on issue #
36869295: com.qti.qualcomm.datastatusnotification..." into oc-dev
am:
36de376430
Change-Id: I96f6f541d2cf285d593f82ad548057a4873ae958
Dianne Hackborn [Wed, 5 Apr 2017 20:46:48 +0000 (20:46 +0000)]
Merge "Deliver start service args with ParcelledListSlice." into oc-dev
am:
1cf2c97459
Change-Id: Iacdd90c6081e93e38cfe932f5210545f33562f7a
Winson Chung [Wed, 5 Apr 2017 18:49:38 +0000 (11:49 -0700)]
Workaround for input ANR, always finish PiP menu activity.
- Always finish the PiP menu activity when the interaction is complete
(either the menu is hidden after showing, or when the user stops
interacting with it and it was shown for the dismiss overlay)
- Fix issue with bounds animation callback not working due to the app
window being removed and not updating the app transition that its
animation "finished"
- Add additional logging throughout to trace PiP animation
Bug:
36877782
Test: Enter PIP, tap to show menu, wait for it to hide, and then use
wired headset button
Change-Id: Ie88ba107d7fffdd182a4063ef4f324b58669d0ad
Tenghui Zhu [Wed, 5 Apr 2017 20:44:28 +0000 (20:44 +0000)]
Merge "Make sure we handle the matrix separately for non-invertable matrix" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 20:43:38 +0000 (20:43 +0000)]
Merge "Allow background default container service in a less crashy way" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 20:43:19 +0000 (20:43 +0000)]
Merge "AAPT2: Fix pseudolocalization (again)" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 20:41:56 +0000 (20:41 +0000)]
Merge "Fix NPE when adding WebView to ResourcesManager" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 20:40:53 +0000 (20:40 +0000)]
Merge "Work on issue #
36869295: com.qti.qualcomm.datastatusnotification..." into oc-dev
Dianne Hackborn [Wed, 5 Apr 2017 00:23:14 +0000 (17:23 -0700)]
Work on issue #
36869295: com.qti.qualcomm.datastatusnotification...
...is not Bg Check compliant
Make the exception message include the state of the app's
UidRecord to help debug what is going on.
Test: boot and ran
Change-Id: Ie829265c7979ccabf8bae0bc6521bd9a7357d77f
Dianne Hackborn [Wed, 5 Apr 2017 20:37:31 +0000 (20:37 +0000)]
Merge "Deliver start service args with ParcelledListSlice." into oc-dev
Adrian Roos [Wed, 5 Apr 2017 20:36:49 +0000 (20:36 +0000)]
Merge changes Ibdf9cf90,I3a6dd476,Id4008fc7,Iede88d1e into oc-dev
am:
debabde073
Change-Id: I9550d91619d544d80dae1de51412527733a18e80
Felipe Leme [Wed, 5 Apr 2017 20:32:10 +0000 (20:32 +0000)]
Merge "Removed deprecated auto(F)ill classes." into oc-dev
am:
b44feb154b
Change-Id: I95768d5e62af9f9fd6469b8a8e36c6e6a196091a
TreeHugger Robot [Wed, 5 Apr 2017 20:30:15 +0000 (20:30 +0000)]
Merge changes Ibdf9cf90,I3a6dd476,Id4008fc7,Iede88d1e into oc-dev
* changes:
NotificationViewWrapper: Fix crash for custom views
Revert "Revert "AOD: Use color filter to invert icons for AOD""
Revert "Revert "NotificationWrappers: Factor out doze treatment""
AOD: prevent clicking shelf when dark
Dmitry Dementyev [Wed, 5 Apr 2017 20:26:05 +0000 (20:26 +0000)]
Merge "Clear calling identity before getUserAccounts in AccountManagerService" into oc-dev
am:
8c9f966eab
Change-Id: I96d92e870a377ac0c5b6a08d4f1affc01fa07396
TreeHugger Robot [Wed, 5 Apr 2017 20:25:36 +0000 (20:25 +0000)]
Merge "Removed deprecated auto(F)ill classes." into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 20:18:38 +0000 (20:18 +0000)]
Merge "Clear calling identity before getUserAccounts in AccountManagerService" into oc-dev
Chad Brubaker [Wed, 5 Apr 2017 20:08:21 +0000 (13:08 -0700)]
Serialize visibleToInstantApps
Bug:
36972663
Test: Webview continues working
Change-Id: I680797f0a7edc71917aaf2e0bc56972a39847f8f
Rubin Xu [Wed, 5 Apr 2017 20:07:18 +0000 (20:07 +0000)]
Merge "Tweak javadoc of setResetPasswordToken" into oc-dev
am:
ae23290ef5
Change-Id: Ib8988c2c0c07aba71fe995a64c7bb7d8fe504141
Daniel Nishi [Wed, 5 Apr 2017 20:05:45 +0000 (20:05 +0000)]
Merge "Add storage fullness methods to volume provider." into oc-dev
am:
4566fd3abc
Change-Id: I8183ebd7dedf01767b046863e6e7ba1e550a9b08
TreeHugger Robot [Wed, 5 Apr 2017 20:01:59 +0000 (20:01 +0000)]
Merge "Tweak javadoc of setResetPasswordToken" into oc-dev
Daniel Nishi [Wed, 5 Apr 2017 19:59:12 +0000 (19:59 +0000)]
Merge "Add storage fullness methods to volume provider." into oc-dev
Kang Li [Wed, 5 Apr 2017 19:57:08 +0000 (19:57 +0000)]
Merge "Revert "Add a service to rank apps for ResolverActivity."" into oc-dev
am:
b24399547c
Change-Id: I45e96d0b5e88eb280e6dbc5981e6a6a7f1a4b6e2
Kang Li [Wed, 5 Apr 2017 19:50:06 +0000 (19:50 +0000)]
Merge "Revert "Add a service to rank apps for ResolverActivity."" into oc-dev
Kang Li [Wed, 5 Apr 2017 16:13:12 +0000 (16:13 +0000)]
Revert "Add a service to rank apps for ResolverActivity."
This reverts commit
90370e0b2497deba9382ab7ff1539b6849df8139.
b:
36952725
Change-Id: Ifa8f182c707cdbbc989b1f61630f7a8fa856d32d
Hall Liu [Wed, 5 Apr 2017 19:43:39 +0000 (19:43 +0000)]
Merge "Query geo description in worker thread to prevent ANR" am:
eb7c287c71 am:
53d241411a
am:
b0e36dec89
Change-Id: Idf51f20246e2bd91dcc0b65ec2102b788d9e10fe
Hall Liu [Wed, 5 Apr 2017 19:38:07 +0000 (19:38 +0000)]
Merge "Query geo description in worker thread to prevent ANR" am:
eb7c287c71
am:
53d241411a
Change-Id: If224f142cf1bb77ecf8ed515250ad5c813682eb0
Todd Kennedy [Wed, 5 Apr 2017 19:38:04 +0000 (19:38 +0000)]
Merge "look for old intent values" into oc-dev
am:
1aade4e4a1
Change-Id: I3c5d202886862de4b631e23fffb357613998ac6b
OSDN Git Service
