OSDN Git Service
The Android Automerger [Tue, 10 Feb 2015 14:12:12 +0000 (06:12 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Andre Eisenbach [Fri, 6 Feb 2015 04:07:50 +0000 (20:07 -0800)]
Add API to check if a Bluetooth connection is encrypted (2/2)
Bug:
19186961
Change-Id: Ied8dbe60995ebe8759c2a4ce21f373b597ed3afe
The Android Automerger [Tue, 27 Jan 2015 14:10:18 +0000 (06:10 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Matthew Xie [Fri, 23 Jan 2015 22:51:46 +0000 (14:51 -0800)]
Use LTE signal level when under LTE
Bug:
17898918
Change-Id: I9f3bb8d874e24440c2b8de85a6a0d7dbdadb3935
The Android Automerger [Wed, 21 Jan 2015 14:10:02 +0000 (06:10 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Andre Eisenbach [Tue, 20 Jan 2015 23:18:19 +0000 (23:18 +0000)]
Merge "Remove GATT context if client registration did not succeed" into lmp-mr1-dev
The Android Automerger [Mon, 19 Jan 2015 14:10:13 +0000 (06:10 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Andre Eisenbach [Fri, 16 Jan 2015 21:02:48 +0000 (13:02 -0800)]
Remove GATT context if client registration did not succeed
Bug:
19028495
Change-Id: I25827e365621fa9b3ef6e85ef9c103cf03654b7c
Andre Eisenbach [Thu, 15 Jan 2015 23:36:55 +0000 (23:36 +0000)]
Merge "Improve VCARD filter logic and reduce log spam" into lmp-mr1-dev
The Android Automerger [Wed, 14 Jan 2015 14:10:22 +0000 (06:10 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Wink Saville [Tue, 13 Jan 2015 19:02:24 +0000 (19:02 +0000)]
Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
Wink Saville [Tue, 13 Jan 2015 00:50:32 +0000 (16:50 -0800)]
Rename reg/unreg OnSubscriptionsChangedListener.
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.
Bug:
18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
Andre Eisenbach [Wed, 7 Jan 2015 22:25:19 +0000 (14:25 -0800)]
Improve VCARD filter logic and reduce log spam
Remove a stray log message in VCardFilter.applyFilter() function that
leads to high-frequency log spam during phone book synchronization. Also
refactored the logic to avoid multiple loops & loop iterations causing
higher CPU load.
Bug:
18913091
Change-Id: I3c6d3c3373d4a74a930d182ee2641959461b0556
Wei Wang [Fri, 9 Jan 2015 22:39:35 +0000 (14:39 -0800)]
Fix Bluetooth crash when all filters are used.
Bug:
18963121
Change-Id: Ia69ad697d5be5b0a5e076f33e513aa2698a7468c
The Android Automerger [Mon, 22 Dec 2014 14:10:52 +0000 (06:10 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Andre Eisenbach [Thu, 18 Dec 2014 22:33:38 +0000 (22:33 +0000)]
Merge "Add EventLog for configHciSnoopLog() security check" into lmp-mr1-dev
Wink Saville [Thu, 11 Dec 2014 18:09:43 +0000 (10:09 -0800)]
Rename isValidSubId to isValidSubscriptionid.
Bug:
18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
Andre Eisenbach [Wed, 17 Dec 2014 21:45:18 +0000 (13:45 -0800)]
Add EventLog for configHciSnoopLog() security check
Bug:
18643224
Change-Id: I9c3f5e0880310e02a187d88349c5624bdade42eb
Andre Eisenbach [Wed, 17 Dec 2014 16:55:57 +0000 (16:55 +0000)]
Merge "Enforce BLUETOOTH_PRIVILEGED permission for HID-over-GATT" into lmp-mr1-dev
Santos Cordon [Wed, 17 Dec 2014 16:21:05 +0000 (16:21 +0000)]
Merge "Allow system process to interact with Bluetooth across users." into lmp-mr1-dev
Andre Eisenbach [Tue, 16 Dec 2014 21:43:52 +0000 (13:43 -0800)]
Enforce BLUETOOTH_PRIVILEGED permission for HID-over-GATT
Bug:
18359172
Change-Id: I06ed22af9dab8129ba7668dadd5b988d63c8a527
Santos Cordon [Tue, 16 Dec 2014 18:02:44 +0000 (10:02 -0800)]
Allow system process to interact with Bluetooth across users.
Bug:
18688307
Change-Id: If31703fbe515baa40c242f99a61479a1ec8152b1
Andre Eisenbach [Tue, 16 Dec 2014 19:46:34 +0000 (19:46 +0000)]
Merge "Prevent possible NullPointerException when service is destroyed" into lmp-mr1-dev
Andre Eisenbach [Tue, 16 Dec 2014 16:58:43 +0000 (08:58 -0800)]
Prevent possible NullPointerException when service is destroyed
Bug:
18757778
Change-Id: Iaf2c8e41a5733379d171f58a35d09c506080fe5d
Andre Eisenbach [Tue, 16 Dec 2014 16:43:23 +0000 (16:43 +0000)]
Merge "Prevent duplicate OPP permission request dialogs" into lmp-mr1-dev
Andre Eisenbach [Tue, 16 Dec 2014 01:59:25 +0000 (17:59 -0800)]
Prevent non-system users from enabling Bluetooth HCI logging
Bug:
18643224
Change-Id: I990aa3dac478d332f565496d0353c9677ea85d46
Andre Eisenbach [Sun, 14 Dec 2014 20:22:31 +0000 (12:22 -0800)]
Prevent duplicate OPP permission request dialogs
When multiple files are sent in a single OPP session, the user should be
prompted to accept/reject only once.
Bug:
17770561
Change-Id: I438116915883c5fdc2d743f13456006f66511c0f
Wink Saville [Fri, 12 Dec 2014 04:23:13 +0000 (04:23 +0000)]
Merge "Rename isValidSubId to isValidSubscriptionid." into lmp-mr1-dev
Kim Schulz [Wed, 10 Dec 2014 20:51:46 +0000 (12:51 -0800)]
Prevent Cursor leakage in Bluetooth MAP
Bug:
18415378
Change-Id: Id513ee848dd21c641d77be38bdc6be85b5ef87a8
Wink Saville [Thu, 11 Dec 2014 18:09:43 +0000 (10:09 -0800)]
Rename isValidSubId to isValidSubscriptionid.
Bug:
18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
The Android Automerger [Wed, 10 Dec 2014 14:11:30 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Andre Eisenbach [Tue, 9 Dec 2014 17:02:53 +0000 (17:02 +0000)]
Merge "Remove missing object to avoid NPE" into lmp-mr1-dev
The Android Automerger [Tue, 9 Dec 2014 14:10:37 +0000 (06:10 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Wei Wang [Mon, 8 Dec 2014 19:26:49 +0000 (11:26 -0800)]
Fix timestamp parsing issue for full scan results.
Bug:
18663523
Change-Id: If0ba083125d75e857072519fc7d6226a4db0273a
The Android Automerger [Mon, 8 Dec 2014 14:11:35 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Jason Monk [Mon, 8 Dec 2014 14:01:21 +0000 (14:01 +0000)]
Merge "Allow SystemUI access to bluetooth from user 0" into lmp-mr1-dev
Prem Kumar [Mon, 8 Dec 2014 05:57:55 +0000 (05:57 +0000)]
Merge "Revert "Bluetooth: Added Shared Preferences to restore tethering preference"" into lmp-mr1-dev
Jason Monk [Fri, 5 Dec 2014 18:01:51 +0000 (13:01 -0500)]
Allow SystemUI access to bluetooth from user 0
SystemUI always runs in the owner user, so when a secondary user
if foreground we need a special case to allow it access to bluetooth.
Bug:
18151285
Change-Id: I555dc2e4b4ff4929f9796fb888dd845fd066b368
Benjamin Franz [Fri, 5 Dec 2014 12:04:19 +0000 (12:04 +0000)]
Merge "Allow managed profile apps to use some bluetooth functionality." into lmp-mr1-dev
The Android Automerger [Thu, 4 Dec 2014 14:12:09 +0000 (06:12 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Matthew Xie [Thu, 4 Dec 2014 08:05:30 +0000 (08:05 +0000)]
Merge "Nullpointer check on mAdapterService in ProfileService#onCreate" into lmp-mr1-dev
Matthew Xie [Thu, 4 Dec 2014 00:52:37 +0000 (16:52 -0800)]
Nullpointer check on mAdapterService in ProfileService#onCreate
Bug:
18595130
Change-Id: I02d588dab94e1dc6c24402259e5b8cea2a98b482
Matthew Xie [Wed, 3 Dec 2014 01:50:55 +0000 (17:50 -0800)]
Revert "Bluetooth: Added Shared Preferences to restore tethering preference"
This reverts commit
cdd2da9489cdfcf35ffdc622eba6f2155f6d376e.
Bug
18452422
Change-Id: I6039ab98038773691dce7667c53256fa04c51df9
Matthew Xie [Wed, 3 Dec 2014 21:42:23 +0000 (21:42 +0000)]
Merge "Turn off map debug verbose messages" into lmp-mr1-dev
The Android Automerger [Wed, 3 Dec 2014 14:10:41 +0000 (06:10 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Michal Labedzki [Fri, 31 Oct 2014 13:36:42 +0000 (14:36 +0100)]
Remove missing object to avoid NPE
Initialization of mContentView was removed in commit
addfd25b639047e8463772b14f249758bdb20fbc, but is still
referenced during timeout causing NPE. Remove reference
as it is not needed.
Bug:
18309654
Change-Id: Id42810a97d638fd761a32069b591fc2b647e3a67
Andre Eisenbach [Tue, 2 Dec 2014 21:48:18 +0000 (21:48 +0000)]
Merge "Add GATT debug information to dumpsys/bugreport" into lmp-mr1-dev
Andre Eisenbach [Tue, 2 Dec 2014 17:17:42 +0000 (09:17 -0800)]
Add GATT debug information to dumpsys/bugreport
Bug:
17894347
Change-Id: I70a2e237e4aa6a1057e5ff519f3f6148a27b3a98
The Android Automerger [Tue, 2 Dec 2014 14:11:11 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Benjamin Franz [Wed, 5 Nov 2014 20:43:27 +0000 (20:43 +0000)]
Allow managed profile apps to use some bluetooth functionality.
Adding a function that checks whether the calling user is the foreground
user or a managed profile associated to this user. This function is
deployed in selected spots to give managed profile apps access to some
part of the bluetooth functionality including the HeadsetService.
Bug:
16968338
Change-Id: Ib0db0847cf361b449484195553725c38ede3b618
Andre Eisenbach [Tue, 2 Dec 2014 08:01:54 +0000 (08:01 +0000)]
Merge "Add server-side callback for change in MTU (3/4)" into lmp-mr1-dev
Matthew Xie [Mon, 1 Dec 2014 20:44:54 +0000 (12:44 -0800)]
Turn off map debug verbose messages
Still leave the debug messages on to provide some basic debug info
Bug:
18486776
Change-Id: I08fc5c69d9a128ec5ddc97203d02b82ced255262
Matthew Xie [Mon, 1 Dec 2014 20:01:17 +0000 (20:01 +0000)]
am
668467e0: am
bf75bdac: am
c9332240: am
845b549b: am
d9761c69: am
859909c0: am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
668467e070ea735e55aaa3fa4384f5d44dea2bc8':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:54:23 +0000 (19:54 +0000)]
am
bf75bdac: am
c9332240: am
845b549b: am
d9761c69: am
859909c0: am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
bf75bdaca1c044f9806b5cb5df7415ad57d20fb9':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:50:29 +0000 (19:50 +0000)]
am
c9332240: am
845b549b: am
d9761c69: am
859909c0: am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
c9332240afc6dd5422379a8c2208a1c438ef591f':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:44:06 +0000 (19:44 +0000)]
am
e4b62388: am
75a925e9: Merge "Check previous user confirmation before auto-confirm put request" into lmp-dev
* commit '
e4b62388082032bb0df535647819d95243abfab5':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:41:57 +0000 (19:41 +0000)]
am
845b549b: am
d9761c69: am
859909c0: am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
845b549b22fc861279a3c8fe2d4a83bad6f135d5':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:36:55 +0000 (19:36 +0000)]
am
d9761c69: am
859909c0: am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
d9761c692ffbc621460054ad2f034557ad330b7d':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:31:34 +0000 (19:31 +0000)]
am
859909c0: am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
859909c048c3477ea47d8dba50f025b8fbf13c90':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:26:52 +0000 (19:26 +0000)]
am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
33cbe67533f97c2e819a84ed6b6950bdd7639749':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:03:09 +0000 (19:03 +0000)]
am
75a925e9: Merge "Check previous user confirmation before auto-confirm put request" into lmp-dev
* commit '
75a925e98f895d59a612a5f96050845f3553dd25':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 18:55:34 +0000 (18:55 +0000)]
Merge "Check previous user confirmation before auto-confirm put request" into lmp-dev
The Android Automerger [Thu, 27 Nov 2014 14:14:55 +0000 (06:14 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Andre Eisenbach [Wed, 26 Nov 2014 20:57:58 +0000 (12:57 -0800)]
Add server-side callback for change in MTU (3/4)
When a client requests to update the LE transport MTU, the server
currently does not get notified and can therefor not properly size
notifications appropriate to the current MTU.
Bug:
18388114
Change-Id: Ie075871cbc643bd3840e9ab472706f1565b74467
Matthew Xie [Wed, 26 Nov 2014 00:59:40 +0000 (00:59 +0000)]
am
fcd9bd0d: DO NOT MERGE Move wake alarm setting and releasing into AdapterService\'s handler
* commit '
fcd9bd0d130f1050aa7e68c65f1595ef8fc24e68':
DO NOT MERGE Move wake alarm setting and releasing into AdapterService's handler
Matthew Xie [Tue, 25 Nov 2014 23:19:51 +0000 (15:19 -0800)]
DO NOT MERGE Move wake alarm setting and releasing into AdapterService's handler
The setting and firing of the alarm wake lock came from different thread
and cause deadlock.
Note: not merging down into MR1 so that further testing can be done.
Bug:
18511282
Change-Id: I32b18cb21d503f10a8e49b1e86c949ebe96b3482
Matthew Xie [Mon, 24 Nov 2014 23:56:46 +0000 (23:56 +0000)]
am
2f65cee9: am
38a952fe: am
b16b868d: am
d4a6ad3a: am
d981ab06: Check previous user confirmation before auto-confirm put request
* commit '
2f65cee9a3058a183c67f95571aa1dda7077112f':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 24 Nov 2014 23:49:48 +0000 (23:49 +0000)]
am
38a952fe: am
b16b868d: am
d4a6ad3a: am
d981ab06: Check previous user confirmation before auto-confirm put request
* commit '
38a952fe66d78602095ab65ef36f321e99c295a6':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 24 Nov 2014 23:35:30 +0000 (23:35 +0000)]
am
b16b868d: am
d4a6ad3a: am
d981ab06: Check previous user confirmation before auto-confirm put request
* commit '
b16b868dc8df463e688069870d6f53ae17ecdaa8':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 24 Nov 2014 23:26:59 +0000 (23:26 +0000)]
am
d4a6ad3a: am
d981ab06: Check previous user confirmation before auto-confirm put request
* commit '
d4a6ad3a5f5d12ee6901b7a83260267c83dabd76':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 24 Nov 2014 23:22:02 +0000 (23:22 +0000)]
am
d981ab06: Check previous user confirmation before auto-confirm put request
* commit '
d981ab06c6844ef345cd0a1d3077c4840f978989':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 17 Nov 2014 17:50:54 +0000 (09:50 -0800)]
Check previous user confirmation before auto-confirm put request
Also correct a confirm status change check in updateShare.
Bug:
17770561,
18343032
Change-Id: I8e7d10e73604c0bf1c88801a1caef7d579fbd1eb
(cherry picked from commit
e93cc4d347fd5d263d7740ad85f7f99b64651126)
Matthew Xie [Mon, 17 Nov 2014 17:50:54 +0000 (09:50 -0800)]
Check previous user confirmation before auto-confirm put request
Also correct a confirm status change check in updateShare.
Bug:
17770561,
18343032
Change-Id: I8e7d10e73604c0bf1c88801a1caef7d579fbd1eb
(cherry picked from commit
e93cc4d347fd5d263d7740ad85f7f99b64651126)
Matthew Xie [Mon, 17 Nov 2014 17:50:54 +0000 (09:50 -0800)]
Check previous user confirmation before auto-confirm put request
Also correct a confirm status change check in updateShare.
Bug:
17770561,
18343032
Change-Id: I8e7d10e73604c0bf1c88801a1caef7d579fbd1eb
(cherry picked from commit
e93cc4d347fd5d263d7740ad85f7f99b64651126)
Matthew Xie [Mon, 24 Nov 2014 20:36:40 +0000 (20:36 +0000)]
Merge "Check previous user confirmation before auto-confirm put request" into lmp-mr1-dev
The Android Automerger [Mon, 24 Nov 2014 14:12:26 +0000 (06:12 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Wink Saville [Thu, 20 Nov 2014 21:02:00 +0000 (13:02 -0800)]
Additional changes to SubscriptionManager API as per API council.
bug:
17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
Wink Saville [Thu, 20 Nov 2014 20:29:42 +0000 (20:29 +0000)]
Revert "Additional changes to SubscriptionManager API as per API council."
This reverts commit
13e1a71bf0cf955ac39390fd96fd3f04e1954ef6.
Change-Id: Ib22d745d17dcf6dca3567e903670ca7cc323138b
Wink Saville [Tue, 18 Nov 2014 20:39:08 +0000 (12:39 -0800)]
Additional changes to SubscriptionManager API as per API council.
bug:
17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
Matthew Xie [Mon, 17 Nov 2014 17:50:54 +0000 (09:50 -0800)]
Check previous user confirmation before auto-confirm put request
Also correct a confirm status change check in updateShare.
Bug:
17770561,
18343032
Change-Id: I8e7d10e73604c0bf1c88801a1caef7d579fbd1eb
The Android Automerger [Wed, 12 Nov 2014 14:11:57 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Wink Saville [Tue, 11 Nov 2014 16:37:56 +0000 (08:37 -0800)]
Update SubscriptionManager API as per API council.
bug:
17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
The Android Automerger [Mon, 10 Nov 2014 14:11:20 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Sun, 9 Nov 2014 16:05:13 +0000 (08:05 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Sat, 8 Nov 2014 14:13:40 +0000 (06:13 -0800)]
merge in lmp-mr1-release history after reset to
cc633970b1fc16db030da1634a0c92fa3548a465
Mike Lockwood [Sat, 8 Nov 2014 02:15:35 +0000 (02:15 +0000)]
Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev
Matthew Xie [Fri, 7 Nov 2014 17:19:59 +0000 (17:19 +0000)]
am
2f9187a2: am
558571ba: am
5a8e9b03: am
a75e97e7: am
6c32875f: am
b81ccaea: am
964a72ae: updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
* commit '
2f9187a2c99f49a07d6c12e2bb4636b68f820ea6':
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
Matthew Xie [Fri, 7 Nov 2014 17:15:56 +0000 (17:15 +0000)]
am
558571ba: am
5a8e9b03: am
a75e97e7: am
6c32875f: am
b81ccaea: am
964a72ae: updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
* commit '
558571bac3e21acce0056fed8873b23e0309078a':
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
Matthew Xie [Fri, 7 Nov 2014 17:09:37 +0000 (17:09 +0000)]
am
5a8e9b03: am
a75e97e7: am
6c32875f: am
b81ccaea: am
964a72ae: updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
* commit '
5a8e9b03c2a3333a23bc143aa1e036c4556bbe7b':
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
Matthew Xie [Fri, 7 Nov 2014 17:04:49 +0000 (17:04 +0000)]
am
a75e97e7: am
6c32875f: am
b81ccaea: am
964a72ae: updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
* commit '
a75e97e7e56415d4b4d580cf7c780bcf1659e2af':
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
Matthew Xie [Fri, 7 Nov 2014 17:01:18 +0000 (17:01 +0000)]
am
6c32875f: am
b81ccaea: am
964a72ae: updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
* commit '
6c32875f190e8d04f425ef142416a8f2a535a3df':
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
Matthew Xie [Fri, 7 Nov 2014 16:56:15 +0000 (16:56 +0000)]
am
b81ccaea: am
964a72ae: updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
* commit '
b81ccaea320de5e4fc19d5bc5d81874e9e68ead1':
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
Matthew Xie [Fri, 7 Nov 2014 16:52:58 +0000 (16:52 +0000)]
am
964a72ae: updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
* commit '
964a72ae9eebe882aebcab4b5326afb6cc06f595':
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
The Android Automerger [Thu, 6 Nov 2014 14:15:03 +0000 (06:15 -0800)]
merge in lmp-mr1-release history after reset to
cbc5d0efdcc51f6ca83175a69074371d07203781
Matthew Xie [Thu, 23 Oct 2014 19:53:40 +0000 (12:53 -0700)]
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
bug
17770561
Change-Id: I34fb018d9787b4deef8592c71f5539778e76e325
(cherry picked from commit
70743aa46fa95bd252acea614bfde8cc65e03890)
The Android Automerger [Wed, 5 Nov 2014 14:13:35 +0000 (06:13 -0800)]
merge in lmp-mr1-release history after reset to
cbc5d0efdcc51f6ca83175a69074371d07203781
The Android Automerger [Tue, 4 Nov 2014 14:13:07 +0000 (06:13 -0800)]
merge in lmp-mr1-release history after reset to
cbc5d0efdcc51f6ca83175a69074371d07203781
The Android Automerger [Mon, 3 Nov 2014 14:11:46 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to
cbc5d0efdcc51f6ca83175a69074371d07203781
The Android Automerger [Sun, 2 Nov 2014 14:11:18 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to
cbc5d0efdcc51f6ca83175a69074371d07203781
The Android Automerger [Sat, 1 Nov 2014 13:11:43 +0000 (06:11 -0700)]
merge in lmp-mr1-release history after reset to
cbc5d0efdcc51f6ca83175a69074371d07203781
OSDN Git Service
