OSDN Git Service
Phil Weaver [Wed, 8 Jun 2016 02:27:57 +0000 (02:27 +0000)]
Merge \\"Revert \\"Improve accessibility window title behavior\\"\\" into nyc-dev am:
fc71309640
am:
5c32d65e78
Change-Id: If87df534b3c3a796ac6f90392c493a29b0f6d755
Phil Weaver [Wed, 8 Jun 2016 02:24:42 +0000 (02:24 +0000)]
Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
am:
fc71309640
Change-Id: I7b0c0636a69e4cc06d525f60d8621879ce45be22
Phil Weaver [Wed, 8 Jun 2016 02:19:33 +0000 (02:19 +0000)]
Merge "Revert "Improve accessibility window title behavior"" into nyc-dev
Android Build Merger (Role) [Wed, 8 Jun 2016 01:32:22 +0000 (01:32 +0000)]
Merge "Merge \\"Check if task was top of stack before it\\'s removed\\" into nyc-dev am:
94b4029f03 am:
cfefb2b85c" into nyc-mr1-dev-plus-aosp
Chong Zhang [Wed, 8 Jun 2016 01:31:57 +0000 (01:31 +0000)]
Merge \\"Check if task was top of stack before it\\'s removed\\" into nyc-dev am:
94b4029f03
am:
cfefb2b85c
Change-Id: I3550515c849ebe48051c33c9e42fc032be0cd49d
Chong Zhang [Wed, 8 Jun 2016 01:31:05 +0000 (01:31 +0000)]
Merge \\"Check if task was top of stack before it\\'s removed\\" into nyc-dev am:
94b4029f03
am:
b6e31cef99
Change-Id: Ifeaa9d372efc5bf11f4346cb4810bf913c61f7cc
Chong Zhang [Wed, 8 Jun 2016 01:31:01 +0000 (01:31 +0000)]
Merge \"Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am:
723e5afa9e\" into nyc-mr1-dev
am:
22eaf715a1
Change-Id: I657487ecab8b23a002e32072bca17d21e627a804
Android Build Merger (Role) [Wed, 8 Jun 2016 01:27:43 +0000 (01:27 +0000)]
Merge "Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am:
723e5afa9e am:
1895addcef" into nyc-mr1-dev-plus-aosp
Chong Zhang [Wed, 8 Jun 2016 01:27:16 +0000 (01:27 +0000)]
Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am:
723e5afa9e
am:
1895addcef
Change-Id: Ifb8ca430fbb754a73e6b891c5a97e0cf201cf7f4
Chong Zhang [Wed, 8 Jun 2016 01:26:27 +0000 (01:26 +0000)]
Merge \"Check if task was top of stack before it\'s removed\" into nyc-dev
am:
94b4029f03
Change-Id: I58b62cd4b61952e82b2e2e6951b0f3a40511a340
Chong Zhang [Wed, 8 Jun 2016 01:26:10 +0000 (01:26 +0000)]
Merge \"Check if task was top of stack before it\'s removed\" into nyc-dev
am:
94b4029f03
Change-Id: I001916c3c02c016b6240ecb8b16bc545887abefe
Felipe Leme [Wed, 8 Jun 2016 01:25:34 +0000 (01:25 +0000)]
Merge \"Added a getPrimaryStorageSize() method.\" into nyc-mr1-dev
am:
ba3676460a
Change-Id: Ibabc9b60735422360fe770eb7ba57c70532f22c4
Felipe Leme [Wed, 8 Jun 2016 01:25:30 +0000 (01:25 +0000)]
Merge \\"Duplicate file descriptor when dumping asynchronously.\\" into nyc-dev am:
c02ba17898
am:
53c1637134
Change-Id: Ic53a1fd625879f75b8ff541c0a91336fcaea288b
Android Build Merger (Role) [Wed, 8 Jun 2016 01:23:03 +0000 (01:23 +0000)]
Merge "Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev am:
723e5afa9e" into nyc-mr1-dev
Chong Zhang [Wed, 8 Jun 2016 01:22:43 +0000 (01:22 +0000)]
Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
am:
723e5afa9e
Change-Id: Ib739a55588b270e76cdb11c5356fd90c19c644dc
TreeHugger Robot [Wed, 8 Jun 2016 01:22:17 +0000 (01:22 +0000)]
Merge "Added a getPrimaryStorageSize() method." into nyc-mr1-dev
Felipe Leme [Wed, 8 Jun 2016 01:21:57 +0000 (01:21 +0000)]
Merge \\"Duplicate file descriptor when dumping asynchronously.\\" into nyc-dev am:
c02ba17898
am:
9d178342d8
Change-Id: I9afdc281e2fe68c74ef7a676dd4f437013fe909a
Chong Zhang [Wed, 8 Jun 2016 01:19:03 +0000 (01:19 +0000)]
Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
am:
723e5afa9e
Change-Id: I12f294f42e135fc181f585c515cd9ad4589ac1f2
Chong Zhang [Wed, 8 Jun 2016 01:18:00 +0000 (01:18 +0000)]
Merge "Check if task was top of stack before it's removed" into nyc-dev
Felipe Leme [Wed, 8 Jun 2016 01:15:06 +0000 (01:15 +0000)]
Merge \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev
am:
c02ba17898
Change-Id: Ief488d02aac6900453e5344959aad8c417d60c8d
Felipe Leme [Wed, 8 Jun 2016 01:13:55 +0000 (01:13 +0000)]
Merge \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev
am:
c02ba17898
Change-Id: I8a483e5295a5dccf4f11f76316bf47d962fb8f12
Chong Zhang [Wed, 8 Jun 2016 01:12:25 +0000 (01:12 +0000)]
Merge "Use getActivityToken() instead of mToken in isTopOfTask" into nyc-dev
Android Build Merger (Role) [Wed, 8 Jun 2016 01:08:41 +0000 (01:08 +0000)]
Merge "Merge \\"Set fontScale in override config to be equal to global.\\" into nyc-dev am:
c9adac6abb am:
c4d9ea8551" into nyc-mr1-dev-plus-aosp
TreeHugger Robot [Wed, 8 Jun 2016 01:08:40 +0000 (01:08 +0000)]
Merge "Duplicate file descriptor when dumping asynchronously." into nyc-dev
Chong Zhang [Wed, 8 Jun 2016 01:08:14 +0000 (01:08 +0000)]
Merge \\"Set fontScale in override config to be equal to global.\\" into nyc-dev am:
c9adac6abb
am:
c4d9ea8551
Change-Id: I7e59243cd1535fd4c6f55de0f13021036d838918
Chong Zhang [Wed, 8 Jun 2016 01:08:09 +0000 (01:08 +0000)]
Merge \\"Set fontScale in override config to be equal to global.\\" into nyc-dev am:
c9adac6abb
am:
01a3095f5f
Change-Id: I99b830777ca94e095c2d6796681d7aec08ad4d41
Chong Zhang [Wed, 8 Jun 2016 01:04:16 +0000 (01:04 +0000)]
Merge \"Set fontScale in override config to be equal to global.\" into nyc-dev
am:
c9adac6abb
Change-Id: I0291db79581d143cabf5f6bbf8a727c2b8c06df6
Chong Zhang [Wed, 8 Jun 2016 01:04:12 +0000 (01:04 +0000)]
Merge \"Set fontScale in override config to be equal to global.\" into nyc-dev
am:
c9adac6abb
Change-Id: If62da650207267872815af6f7e793b193e23d10e
Chong Zhang [Wed, 8 Jun 2016 00:59:43 +0000 (00:59 +0000)]
Merge "Set fontScale in override config to be equal to global." into nyc-dev
Siyamed Sinir [Wed, 8 Jun 2016 00:59:44 +0000 (00:59 +0000)]
Merge \\"Fix int overflow in SpannableStringBuilder.replace\\" into nyc-dev am:
96c3e5504b
am:
df3d144b17
Change-Id: I50d759b3865fe66e23f5bc82199c9b512a3489c1
Siyamed Sinir [Wed, 8 Jun 2016 00:56:45 +0000 (00:56 +0000)]
Merge \\"Fix int overflow in SpannableStringBuilder.replace\\" into nyc-dev am:
96c3e5504b
am:
9eddf7ae8e
Change-Id: I2901fa9b6debdac559637732cc5e4eaf4eed8467
Android Build Merger (Role) [Wed, 8 Jun 2016 00:50:46 +0000 (00:50 +0000)]
Merge "Merge \\"Frameworks/base: Fix FastPrintWriter infinite loop\\" into nyc-dev am:
c82a2b5358 am:
66c2bfcede" into nyc-mr1-dev-plus-aosp
Andreas Gampe [Wed, 8 Jun 2016 00:50:17 +0000 (00:50 +0000)]
Merge \\"Frameworks/base: Fix FastPrintWriter infinite loop\\" into nyc-dev am:
c82a2b5358
am:
66c2bfcede
Change-Id: I3c4525f3931443aa6a2e16816924850e41c952b7
Siyamed Sinir [Wed, 8 Jun 2016 00:50:15 +0000 (00:50 +0000)]
Merge \"Fix int overflow in SpannableStringBuilder.replace\" into nyc-dev
am:
96c3e5504b
Change-Id: I98179e88a6ce8838dd84131b9402255920822856
Siyamed Sinir [Wed, 8 Jun 2016 00:50:14 +0000 (00:50 +0000)]
Merge \"Fix int overflow in SpannableStringBuilder.replace\" into nyc-dev
am:
96c3e5504b
Change-Id: Ibac22676dcfcd8874bc2415f7fb4f76849896748
Andreas Gampe [Wed, 8 Jun 2016 00:50:03 +0000 (00:50 +0000)]
Merge \\"Frameworks/base: Fix FastPrintWriter infinite loop\\" into nyc-dev am:
c82a2b5358
am:
89b7934905
Change-Id: Idaa84ae75512929656f63318db819232f42d91f7
Siyamed Sinir [Wed, 8 Jun 2016 00:46:27 +0000 (00:46 +0000)]
Merge "Fix int overflow in SpannableStringBuilder.replace" into nyc-dev
Android Build Merger (Role) [Wed, 8 Jun 2016 00:46:12 +0000 (00:46 +0000)]
Merge "Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am:
4401e24add am:
2cf5b73c0a" into nyc-mr1-dev-plus-aosp
Andreas Gampe [Wed, 8 Jun 2016 00:45:35 +0000 (00:45 +0000)]
Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev
am:
c82a2b5358
Change-Id: I3da283b088e2e0d689ac35d634823497fa2fece1
Jim Miller [Wed, 8 Jun 2016 00:45:35 +0000 (00:45 +0000)]
Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am:
4401e24add
am:
2cf5b73c0a
Change-Id: Ie2c8adbeefaab6f9fa1ff6802d938e31be065b84
Andreas Gampe [Wed, 8 Jun 2016 00:45:34 +0000 (00:45 +0000)]
Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev
am:
c82a2b5358
Change-Id: I9ff1746643acbbf8663b6e1c5fce553e4f803df4
Jim Miller [Wed, 8 Jun 2016 00:43:48 +0000 (00:43 +0000)]
Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am:
4401e24add
am:
21c77ed1a8
Change-Id: I7c561e027b7216686b8d096ac97e6c6c5a633eaf
TreeHugger Robot [Wed, 8 Jun 2016 00:38:59 +0000 (00:38 +0000)]
Merge "Frameworks/base: Fix FastPrintWriter infinite loop" into nyc-dev
Jim Miller [Wed, 8 Jun 2016 00:38:31 +0000 (00:38 +0000)]
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am:
4401e24add
Change-Id: Ic10c6505e4583f487a41eb659227b955013949b7
Jim Miller [Wed, 8 Jun 2016 00:38:25 +0000 (00:38 +0000)]
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am:
4401e24add
Change-Id: Ibe8709900618cc5d9c5ca18a88ca6fce8c552d54
Phil Weaver [Wed, 8 Jun 2016 00:34:40 +0000 (00:34 +0000)]
Revert "Improve accessibility window title behavior"
Bug:
29127065
This reverts commit
2a7e4442bf9892842e0fc7eba9296e8fcf9f8ea5.
Change-Id: Ibc5527cfedd49c685ffd1b8ae59e87ed99c93d39
TreeHugger Robot [Wed, 8 Jun 2016 00:31:28 +0000 (00:31 +0000)]
Merge "Move legacy full disk encryption code to Settings." into nyc-dev
Sharvil Nanavati [Tue, 7 Jun 2016 23:47:39 +0000 (23:47 +0000)]
Merge \"Fix build break by adding missing parenthesis.\" into nyc-mr1-dev
am:
f4f7c64c75
Change-Id: Ie10bd4ea8d7345550fb4a42090320d31669321fa
Sharvil Nanavati [Tue, 7 Jun 2016 23:43:43 +0000 (23:43 +0000)]
Merge "Fix build break by adding missing parenthesis." into nyc-mr1-dev
Felipe Leme [Thu, 12 May 2016 19:56:28 +0000 (12:56 -0700)]
Added a getPrimaryStorageSize() method.
BUG:
24128505
Change-Id: I0b75d3c5505dadedf5d06868614b3a01765cc5d3
** Cherrypicked from master **
Sharvil Nanavati [Tue, 7 Jun 2016 23:41:16 +0000 (16:41 -0700)]
Fix build break by adding missing parenthesis.
Change-Id: Ia9a47e24b25e3093f19aeea297a86964c8f00722
Felipe Leme [Tue, 7 Jun 2016 23:14:07 +0000 (16:14 -0700)]
Duplicate file descriptor when dumping asynchronously.
dumpDbInfo() uses an async task when dumping from the system thread, but
then the file descriptor is closed by the time the task is executed. As
such, the system databases are not dumped.
BUG:
29123428
Change-Id: Ibb8bbe503aa03c3ca13b2b1789f0ead0b869e9d5
David Sehr [Tue, 7 Jun 2016 23:16:40 +0000 (23:16 +0000)]
Merge \\"Add usage line for dump-profiles\\" into nyc-dev am:
a85c1e8e69
am:
eff498946f
Change-Id: I763463605dd5ed84aec0f3c6502f944fefe24388
David Sehr [Tue, 7 Jun 2016 23:13:11 +0000 (23:13 +0000)]
Merge \\"Add usage line for dump-profiles\\" into nyc-dev am:
a85c1e8e69
am:
514c1ae4c6
Change-Id: I798f8c789c8735462c556c6c1c469a1abe1f6f4a
David Sehr [Tue, 7 Jun 2016 23:10:07 +0000 (23:10 +0000)]
Merge \"Add usage line for dump-profiles\" into nyc-dev
am:
a85c1e8e69
Change-Id: I62cf1d3c0ea6295500fbb730dfa75e7046c8c06d
David Sehr [Tue, 7 Jun 2016 23:07:41 +0000 (23:07 +0000)]
Merge \"Add usage line for dump-profiles\" into nyc-dev
am:
a85c1e8e69
Change-Id: I301304ff28674e00c8c1d49b968f090838ae64b3
Dirk Dougherty [Tue, 7 Jun 2016 23:04:33 +0000 (23:04 +0000)]
Minor fixes to distribute cards and fab. am:
5ec3a404fb am:
ba9c3d585f am:
f5c85abac6 am:
f91783c8a5
am:
ba446488aa
Change-Id: Ieff4647f43be330106f0d0af61c8c285c3804508
Dirk Dougherty [Tue, 7 Jun 2016 23:02:51 +0000 (23:02 +0000)]
Minor fixes to distribute cards and fab. am:
5ec3a404fb am:
ba9c3d585f am:
f5c85abac6 am:
f91783c8a5
am:
db4948a1d3
Change-Id: I4c707846a9dd911f96e57bb0ba91deb7a7d3c94d
Andreas Gampe [Tue, 7 Jun 2016 23:02:23 +0000 (16:02 -0700)]
Frameworks/base: Fix FastPrintWriter infinite loop
Check for error condition in loop.
Bug:
29123428
Change-Id: I361ed27ecb8f05512d7e17f8045f3d34667d32d8
David Sehr [Tue, 7 Jun 2016 23:01:09 +0000 (23:01 +0000)]
Merge "Add usage line for dump-profiles" into nyc-dev
Dirk Dougherty [Tue, 7 Jun 2016 22:57:42 +0000 (22:57 +0000)]
Minor fixes to distribute cards and fab. am:
5ec3a404fb am:
ba9c3d585f am:
f5c85abac6
am:
f91783c8a5
Change-Id: I887922ef823327cb484c113f1b4d85ebf01f9576
Dirk Dougherty [Tue, 7 Jun 2016 22:57:41 +0000 (22:57 +0000)]
Minor fixes to distribute cards and fab. am:
5ec3a404fb am:
ba9c3d585f am:
f5c85abac6
am:
f91783c8a5
Change-Id: I1094dd6a0a256ce7dd4942ce02374b4b44786278
Chong Zhang [Sat, 4 Jun 2016 00:43:10 +0000 (17:43 -0700)]
Set fontScale in override config to be equal to global.
The default fontScale in EMPTY config is 1.0. This will result in
updateFrom always overriding the fontScale to 1.0 since it's non-zero.
We can't set it to 0.0 either as that will make the override config
not equal to EMPTY. The rest of the code doesn't work well with that.
So here we always set the override fontScale to be idential to global.
bug:
29113700
Change-Id: I1dbe507145b8190a9ae5e108948c833d4e037e1d
Dirk Dougherty [Tue, 7 Jun 2016 22:53:20 +0000 (22:53 +0000)]
Minor fixes to distribute cards and fab. am:
5ec3a404fb am:
ba9c3d585f
am:
f5c85abac6
Change-Id: I2ea6f9370725235b9d63f6c5a843e42b09361315
Dirk Dougherty [Tue, 7 Jun 2016 22:48:17 +0000 (22:48 +0000)]
Minor fixes to distribute cards and fab. am:
5ec3a404fb
am:
ba9c3d585f
Change-Id: I6f250c2b9733562e388e2cd81ab9b7c365bb3c9a
Dirk Dougherty [Tue, 7 Jun 2016 22:45:30 +0000 (22:45 +0000)]
Minor fixes to distribute cards and fab.
am:
5ec3a404fb
Change-Id: I47c10ecd60b616bd0f343cb2309820c800d5a077
Dirk Dougherty [Tue, 7 Jun 2016 22:39:03 +0000 (15:39 -0700)]
Minor fixes to distribute cards and fab.
Change-Id: I125162be9d53faef0c477a2e2592624bb5869ff4
Brad Ebinger [Tue, 7 Jun 2016 22:23:50 +0000 (22:23 +0000)]
Merge \"Adds CDMA Voice Privacy Property to Call\" into nyc-mr1-dev
am:
5eebdd8bb8
Change-Id: Ie647b2b460dded6a501f5c19849d610c29d5ebaa
Sharvil Nanavati [Tue, 7 Jun 2016 22:23:38 +0000 (22:23 +0000)]
Merge \"Fix flaky discoverable stress test.\" into nyc-mr1-dev
am:
9e67da47f3
Change-Id: I5583238b6de24571762c656253510b469cd810f1
Brad Ebinger [Tue, 7 Jun 2016 22:14:50 +0000 (22:14 +0000)]
Merge "Adds CDMA Voice Privacy Property to Call" into nyc-mr1-dev
Sharvil Nanavati [Tue, 7 Jun 2016 22:14:21 +0000 (22:14 +0000)]
Merge "Fix flaky discoverable stress test." into nyc-mr1-dev
Android Build Merger (Role) [Tue, 7 Jun 2016 22:05:18 +0000 (22:05 +0000)]
Merge "docs: Added CL commands for data-saver testing am:
b603eae9b3 am:
2d05938af9 am:
d0ef8a0147 am:
16ac726542" into nyc-mr1-dev-plus-aosp
Eric Schmidt [Tue, 7 Jun 2016 22:04:44 +0000 (22:04 +0000)]
docs: Added CL commands for data-saver testing am:
b603eae9b3 am:
2d05938af9 am:
d0ef8a0147
am:
16ac726542
Change-Id: I75b8179c1c4222f7d50c4c645d0fb447656b4661
Eric Schmidt [Tue, 7 Jun 2016 22:04:40 +0000 (22:04 +0000)]
docs: Added CL commands for data-saver testing am:
b603eae9b3 am:
2d05938af9 am:
d0ef8a0147
am:
3fa7b269ea
Change-Id: I6d7d64cda55b6c0ec497b5d2802d68a821a68242
Sharvil Nanavati [Tue, 7 Jun 2016 20:35:59 +0000 (13:35 -0700)]
Fix flaky discoverable stress test.
Bug:
28980767
Change-Id: I6858456f58118a3385b05d42361a5c9223ebbdc4
Eric Schmidt [Tue, 7 Jun 2016 21:57:52 +0000 (21:57 +0000)]
docs: Added CL commands for data-saver testing am:
b603eae9b3 am:
2d05938af9
am:
d0ef8a0147
* commit '
d0ef8a01470e83c9161e398b804b5264d71a6bb3':
docs: Added CL commands for data-saver testing
Change-Id: Ib66755d430ab387f2af39ed127ecaf3c8193b685
Eric Schmidt [Tue, 7 Jun 2016 21:57:50 +0000 (21:57 +0000)]
docs: Added CL commands for data-saver testing am:
b603eae9b3 am:
2d05938af9
am:
d0ef8a0147
* commit '
d0ef8a01470e83c9161e398b804b5264d71a6bb3':
docs: Added CL commands for data-saver testing
Change-Id: I14490c4309d6318436b8430035de8cb27329141e
Eric Schmidt [Tue, 7 Jun 2016 21:52:54 +0000 (21:52 +0000)]
docs: Added CL commands for data-saver testing am:
b603eae9b3
am:
2d05938af9
* commit '
2d05938af9e572ca9582552ad966c18b7b83e94f':
docs: Added CL commands for data-saver testing
Change-Id: Ic0f9a82f05dc32b162013df51c155f2a1a206c45
Eric Schmidt [Tue, 7 Jun 2016 21:47:47 +0000 (21:47 +0000)]
docs: Added CL commands for data-saver testing
am:
b603eae9b3
* commit '
b603eae9b363ca292d721243819dfd701a194b65':
docs: Added CL commands for data-saver testing
Change-Id: I1f5bf236f72db694ddedfe6552f188242d5f61a1
Pavlin Radoslavov [Tue, 7 Jun 2016 21:47:47 +0000 (21:47 +0000)]
resolve merge conflicts of
ae7641a to nyc-dev-plus-aosp
am:
c7d4074aef
* commit '
c7d4074aef4aee0d7ec7e2d1413cf370f6756291':
Delay handleEnable() until Bluetooth state is OFF
Change-Id: Iac013f281d63fe627f4d216f187619adad2d2ccc
Pavlin Radoslavov [Tue, 7 Jun 2016 21:41:08 +0000 (14:41 -0700)]
resolve merge conflicts of
ae7641a to nyc-dev-plus-aosp
Change-Id: I63d00b98c27d7fa1f30385e030b6ffee5e86dc73
Pavlin Radoslavov [Tue, 7 Jun 2016 21:23:23 +0000 (21:23 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF"
am:
98cf9d1a60
* commit '
98cf9d1a606e17b5eeedad5fff9bb5935ebb370b':
Delay handleEnable() until Bluetooth state is OFF
Change-Id: I4461a40459828079ced3b0af313e39825e009bc8
Eric Schmidt [Tue, 31 May 2016 22:56:48 +0000 (15:56 -0700)]
docs: Added CL commands for data-saver testing
Bug:
28951799
Change-Id: I03ae59b1d98b8e58dc859c8158b318718c8a9f13
Treehugger Robot [Tue, 7 Jun 2016 21:14:21 +0000 (21:14 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF"
Sanket Padawe [Tue, 7 Jun 2016 21:00:49 +0000 (21:00 +0000)]
Merge "Fix bug while writing data to parcel in TelephonyHistogram.java" into nyc-mr1-dev
am:
2e9b43efd5
* commit '
2e9b43efd53fbbce733b6e5c328f37c635c699a3':
Fix bug while writing data to parcel in TelephonyHistogram.java
Change-Id: I47cce50a4fdcc0bf4c747a410dd07658424dd9f3
Sanket Padawe [Tue, 7 Jun 2016 20:52:58 +0000 (20:52 +0000)]
Merge "Fix bug while writing data to parcel in TelephonyHistogram.java" into nyc-mr1-dev
Pavlin Radoslavov [Thu, 2 Jun 2016 05:25:18 +0000 (22:25 -0700)]
Delay handleEnable() until Bluetooth state is OFF
During shutdown of the Bluetooth stack, if a request to
enable Bluetooth is received, the request is processed immediately.
As a result, we don't let the Bluetooth service to shutdown cleanly,
and the Bluetooth process with the native backend doesn't go away.
This creates various issues in the native backend stack.
Now, after an enable request is received, if necessary we delay
acting on it, until the Bluetooth state is OFF.
Bug:
17723234
Change-Id: I55db4bbd4f45227aa49eae996dcc328f76557a9b
(cherry picked from commit
e47ec14318f64c29bf16b5a6bb662bc19206d6b0)
ganxiaolin [Tue, 7 Jun 2016 18:19:06 +0000 (18:19 +0000)]
Merge "Delete Visualizer before lpJniStorage" am:
03c209b2a3 am:
913e2f83b2
am:
c8e1206ad5
* commit '
c8e1206ad57f5a359b1e4a193f50f143c9028439':
Delete Visualizer before lpJniStorage
Change-Id: Ie6c74e2d0256a98f76cd19b3475e94331d3f8d49
Eric Laurent [Tue, 7 Jun 2016 18:13:09 +0000 (18:13 +0000)]
Merge "Delete Visualizer before lpJniStorage" am:
03c209b2a3
am:
913e2f83b2
* commit '
913e2f83b223486ac1461dab86758848f9ad08e1':
Delete Visualizer before lpJniStorage
Change-Id: I76aa735d8f0a100e0e106050c90966bd003235bc
ganxiaolin [Tue, 7 Jun 2016 18:07:25 +0000 (18:07 +0000)]
Merge "Delete Visualizer before lpJniStorage"
am:
03c209b2a3
* commit '
03c209b2a3544e3a8ca087bb28b99bd623f16098':
Delete Visualizer before lpJniStorage
Change-Id: Id685a9b6a4735bd2ef34a9d10fba50e37844dc19
Android Build Merger (Role) [Tue, 7 Jun 2016 18:04:20 +0000 (18:04 +0000)]
Merge "Merge "resolve merge conflicts of
b9d266f to nyc-dev-plus-aosp" into nyc-dev-plus-aosp am:
e61d3ff3d1" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 7 Jun 2016 18:04:11 +0000 (18:04 +0000)]
Merge "Merge "Fix getApplicationRestrictions documentation" into nyc-dev am:
a86d6c4df3 am:
36ff488bb4" into nyc-mr1-dev-plus-aosp
Xin Li [Tue, 7 Jun 2016 18:03:36 +0000 (18:03 +0000)]
Merge "resolve merge conflicts of
b9d266f to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
am:
e61d3ff3d1
* commit '
e61d3ff3d131c2f28adee085557cd93853af5e72':
Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService.
Change-Id: Ia6f1c88bba68df6660d7e91e4bedebda22bcf5c5
Esteban Talavera [Tue, 7 Jun 2016 18:03:33 +0000 (18:03 +0000)]
Merge "Fix getApplicationRestrictions documentation" into nyc-dev am:
a86d6c4df3
am:
36ff488bb4
* commit '
36ff488bb475d52629fea412dcd7af57bb3d441f':
Fix getApplicationRestrictions documentation
Change-Id: I6ab4757ac9991377ca1003dbf09afceb5dc86d18
Esteban Talavera [Tue, 7 Jun 2016 18:03:32 +0000 (18:03 +0000)]
Merge "Fix getApplicationRestrictions documentation" into nyc-dev am:
a86d6c4df3
am:
cc12064670
* commit '
cc12064670c9e0ade3ffcb4ff2eed4ddd5d267a8':
Fix getApplicationRestrictions documentation
Change-Id: I7715a46ef865e3e4e936c2baea5e6c52e4783e8d
Eric Laurent [Tue, 7 Jun 2016 18:00:28 +0000 (18:00 +0000)]
Merge "Delete Visualizer before lpJniStorage"
TreeHugger Robot [Tue, 7 Jun 2016 18:00:24 +0000 (18:00 +0000)]
Merge "resolve merge conflicts of
b9d266f to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
Esteban Talavera [Tue, 7 Jun 2016 17:59:02 +0000 (17:59 +0000)]
Merge "Fix getApplicationRestrictions documentation" into nyc-dev
am:
a86d6c4df3
* commit '
a86d6c4df3b193060b4b725e1abfed4f69689843':
Fix getApplicationRestrictions documentation
Change-Id: Idaab3c8f765d5e5631aa69557a9c3f194c9d5d33
Esteban Talavera [Tue, 7 Jun 2016 17:59:01 +0000 (17:59 +0000)]
Merge "Fix getApplicationRestrictions documentation" into nyc-dev
am:
a86d6c4df3
* commit '
a86d6c4df3b193060b4b725e1abfed4f69689843':
Fix getApplicationRestrictions documentation
Change-Id: Ia552cc886a182f558b7479b1d2a0201061dc5cc6
Esteban Talavera [Tue, 7 Jun 2016 17:55:16 +0000 (17:55 +0000)]
Merge "Fix getApplicationRestrictions documentation" into nyc-dev
OSDN Git Service
