OSDN Git Service
Mikhail Naganov [Mon, 2 Apr 2018 17:35:45 +0000 (10:35 -0700)]
AudioSystem: Add log for failed commands
Log if a remote call to the service has failed. The log records
provide info about the calling function and the actual
status. This is useful for debugging from logs since not every
client logs an error, and that log will anyway lack the original
status code.
Test: make
Change-Id: I5a7ff1698f443d37c2d57e2dc3c2ec686debfdec
Wale Ogunwale [Thu, 29 Mar 2018 17:12:53 +0000 (10:12 -0700)]
Don't show show unsupported sdk warning for platform in development
Change-Id: I1526551bee804b76e8ca3ca0684d48b2be3d872f
Bug:
75318890
Test: atest CtsActivityManagerDeviceTestCases:PrereleaseSdkTest
Evan Rosky [Sat, 31 Mar 2018 18:15:20 +0000 (18:15 +0000)]
Merge "Renamed KeyFallbackEvent to UnhandledKeyEvent and exposed dispatch" into pi-dev am:
e1059d9f5e
am:
1334492e2b
Change-Id: Ic2eb0d1c4ea9d7b7ff4c31ff97523225de128aa3
Evan Rosky [Sat, 31 Mar 2018 17:58:18 +0000 (17:58 +0000)]
Merge "Renamed KeyFallbackEvent to UnhandledKeyEvent and exposed dispatch" into pi-dev
am:
e1059d9f5e
Change-Id: I640a4b7be42ed7a358731ef57635a1a27306175f
TreeHugger Robot [Sat, 31 Mar 2018 17:39:18 +0000 (17:39 +0000)]
Merge "Renamed KeyFallbackEvent to UnhandledKeyEvent and exposed dispatch" into pi-dev
Bill Yi [Sat, 31 Mar 2018 14:43:22 +0000 (14:43 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
74c2d21b71 -s ours
am:
190a6adb9b -s ours
Change-Id: If0f9a401c535549f98c656e23bc252365389e597
Bill Yi [Sat, 31 Mar 2018 14:36:47 +0000 (14:36 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
74c2d21b71 -s ours
Change-Id: Ie2d847b5127990fd89e84d3838dce7215617104e
TreeHugger Robot [Sat, 31 Mar 2018 14:28:30 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sat, 31 Mar 2018 06:39:07 +0000 (23:39 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Bug:
76058207
Change-Id: I165c658f21866527efa64c72be81afe5b14f56a7
Ryan Lin [Sat, 31 Mar 2018 10:34:52 +0000 (10:34 +0000)]
Merge "Add callback onProfileAudioStateChanged()" into pi-dev am:
a29957d518
am:
04084ad58e
Change-Id: I62761b9542f838650b78a65ff91fb37c350d7701
Makoto Onuki [Sat, 31 Mar 2018 10:27:37 +0000 (10:27 +0000)]
Merge "Fix dead lock between AM and BatterySaverStateMachine" into pi-dev am:
9cbf27af12
am:
893b56a49c
Change-Id: I2a676dfdbd9eaa6b4172ef77ad70ebac8e13e6fe
Hall Liu [Sat, 31 Mar 2018 10:05:36 +0000 (10:05 +0000)]
Merge "Make changes to MBMS API following recs" into pi-dev am:
7bedbabd0b
am:
88f3f720aa
Change-Id: I7f379b52f99f68d92745efbe2b1da298c3d8ac12
Mady Mellor [Sat, 31 Mar 2018 09:51:14 +0000 (09:51 +0000)]
Merge "Add subtype for layout direction to Slice" into pi-dev am:
703f31db63
am:
dbbffe3948
Change-Id: I1a2a30b9c026dbfe2b99d875f77cabf72a49d53c
Yangster-mac [Sat, 31 Mar 2018 09:45:53 +0000 (09:45 +0000)]
Merge "E2e test for periodic alarm." into pi-dev am:
46eef8d049
am:
5708929c0c
Change-Id: I432b9f5df7e10d3466c2f2fb32e05a1d3722e6fd
Bill Yi [Sat, 31 Mar 2018 09:40:20 +0000 (09:40 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
fbe387ab8f -s ours
am:
75d559d939 -s ours
Change-Id: Ia5ec1ee838e7a1d931a914990671b6fd2705fcb6
Makoto Onuki [Sat, 31 Mar 2018 09:38:08 +0000 (09:38 +0000)]
Merge "Log sync enable/disable too" into pi-dev am:
04ce26d840
am:
74205427b9
Change-Id: I1848954f4190974e912acbb29226c6377b57aec5
Alan Viverette [Sat, 31 Mar 2018 07:15:16 +0000 (07:15 +0000)]
Merge "Migrate to AAPT2" into pi-dev am:
11bd1b601e
am:
4ceb49cafd
Change-Id: I6753ad84b40ed2b99c4d83fb101a8287dd885f31
Yi Jin [Sat, 31 Mar 2018 07:09:46 +0000 (07:09 +0000)]
Merge "Correctly use int types and fix uint64_t print." into pi-dev am:
53f60f60ee
am:
018f5a3ca2
Change-Id: Ie9715a097e15f7ea277fd8a2e839af2a31d61fea
Kevin Chyn [Sat, 31 Mar 2018 07:05:27 +0000 (07:05 +0000)]
Merge "Fingerprint user canceled message should not be delayed" into pi-dev am:
374f6a26f9
am:
2ef863e93b
Change-Id: Ia5fa53875b5bcfa988097e9322d487fe78bd8465
Makoto Onuki [Sat, 31 Mar 2018 07:01:17 +0000 (07:01 +0000)]
Merge "Fix erroneous protected-broadcast check" into pi-dev am:
8c6aa94346
am:
256c320b8c
Change-Id: I23faf6bd84b59f10910495e447e7ccf11cfcff6d
Chenjie Yu [Sat, 31 Mar 2018 06:56:58 +0000 (06:56 +0000)]
Merge "Null pointer check for Bluetooth traffic" into pi-dev am:
2f6f33fa79
am:
263914125a
Change-Id: I5225985621b3e3402996a42f4bed5eddc57597e9
Bookatz [Sat, 31 Mar 2018 06:52:37 +0000 (06:52 +0000)]
Merge "Statsd MAX now obeys refractory periods too" into pi-dev am:
3b826c6075
am:
a44330dd2e
Change-Id: I15cf0b24a1ffcba7368c6045e34fe82acb302b6b
Bo Zhu [Sat, 31 Mar 2018 06:48:36 +0000 (06:48 +0000)]
Merge "Expose e.getMessage() from the exceptions in RecoverableKeyStore" into pi-dev am:
8b60ebc6a6
am:
6da5627b3e
Change-Id: I493f93b450b2842ba5c6c10a88f43dc483fd84c2
Suprabh Shukla [Sat, 31 Mar 2018 06:44:30 +0000 (06:44 +0000)]
Merge "Adding LauncherApps apis for suspended packages" into pi-dev am:
a6d6a5aa79
am:
733b8340a4
Change-Id: Id76853b6b65f128f193ce054491c5b0aaa672d05
Jason Monk [Sat, 31 Mar 2018 06:40:18 +0000 (06:40 +0000)]
Merge "Add some methods to manage slice permissios" into pi-dev am:
35201a6af2
am:
69acc65a37
Change-Id: I97df11f64b66684d73b47cc22e95aa5b4a7ede3e
Ryan Lin [Sat, 31 Mar 2018 06:39:49 +0000 (06:39 +0000)]
Merge "Add callback onProfileAudioStateChanged()" into pi-dev
am:
a29957d518
Change-Id: I781527469bd558617dee57ed431d072ab629705d
Kevin Chyn [Sat, 31 Mar 2018 06:35:53 +0000 (06:35 +0000)]
Merge "Clear fingerprint stats after dump --proto" into pi-dev am:
0d1debfcff
am:
0ea74acf19
Change-Id: Ic549e03363f0897cb107a93c651a96e972fec067
Ryan Lin [Sat, 31 Mar 2018 06:23:26 +0000 (06:23 +0000)]
Merge "Add callback onProfileAudioStateChanged()" into pi-dev
Hall Liu [Sat, 31 Mar 2018 06:15:29 +0000 (06:15 +0000)]
Merge "Merge "Make changes to MBMS API following recs" am:
feb60e0864 am:
2fa2a9d06f" into pi-dev-plus-aosp
am:
46b959e9d8
Change-Id: Ie102667ddc20ade7a822844377fe2778533d2b3e
rago [Sat, 31 Mar 2018 06:04:12 +0000 (06:04 +0000)]
Merge "Dynamics Processing Effect" into pi-dev am:
d41d56e348
am:
d110770ccd
Change-Id: Ib3de104d30a7fcd67744b440a97c360549d149b1
John Reck [Sat, 31 Mar 2018 05:59:55 +0000 (05:59 +0000)]
Merge "Fix regression to drawBitmapArray" into pi-dev am:
a26795a884
am:
1f469b8778
Change-Id: I08d6671125ac8399104c9271c30bd3700594b053
Pavlin Radoslavov [Sat, 31 Mar 2018 05:55:35 +0000 (05:55 +0000)]
[automerger skipped] Merge "Update Bluetooth codec related strings" am:
d10fd55a91 am:
856fe46a69 -s ours
am:
108318aabe -s ours
Change-Id: I06502f514b8a8dac89c9df43aa266619a404da71
Xiangyu/Malcolm Chen [Sat, 31 Mar 2018 05:50:10 +0000 (05:50 +0000)]
Merge "Adding debug message inside NetworkServiceCallback." into pi-dev am:
17d19b7d52
am:
4c9370d606
Change-Id: I821ea39284942797671fc4effbd59e485cbb69fd
Ruchi Kandoi [Sat, 31 Mar 2018 05:46:00 +0000 (05:46 +0000)]
Merge "Make OMAPI stricter" am:
998ef794a3 am:
43056194a5
am:
7c3603a8a9
Change-Id: Ib87ca0c728394bc41a3ffca2b5a671aed871b115
Makoto Onuki [Sat, 31 Mar 2018 05:41:18 +0000 (05:41 +0000)]
Merge "Fix dead lock between AM and BatterySaverStateMachine" into pi-dev
am:
9cbf27af12
Change-Id: Icc350752c3ee97ddef8a412b6a16bd8795bd9c3c
Daniel Cashman [Sat, 31 Mar 2018 05:31:00 +0000 (05:31 +0000)]
Merge "Require signing cert history certs to be unique." into pi-dev am:
d05c00fbb6
am:
24fa4f6cb9
Change-Id: I0658a8b4875f4316a7465f249db9c2aadc5f2cd8
Brian C. Young [Sat, 31 Mar 2018 05:25:31 +0000 (05:25 +0000)]
Merge "Remove getCurrentUser call to find an alternative" into pi-dev am:
1b3844cb84
am:
2d35b7ef6a
Change-Id: Iddc57cb3668a260d791afd92b65ec8269eb8f5f1
TreeHugger Robot [Sat, 31 Mar 2018 05:24:20 +0000 (05:24 +0000)]
Merge "Fix dead lock between AM and BatterySaverStateMachine" into pi-dev
Calin Juravle [Sat, 31 Mar 2018 05:20:16 +0000 (05:20 +0000)]
Merge "Fix BackgroundDexOptTest" into pi-dev am:
ddc4e1ab06
am:
5df6423a29
Change-Id: Ia84e0b99df1765f88b4b2644714da347b6f28880
Benedict Wong [Sat, 31 Mar 2018 05:15:34 +0000 (05:15 +0000)]
[automerger skipped] Merge "Disallow Reserved SPI Allocation" into pi-dev am:
35147b2dae -s ours
am:
5250798702 -s ours
Change-Id: I440ec61196f14e1ceb88255469a1cb15408999c5
Hall Liu [Sat, 31 Mar 2018 05:10:46 +0000 (05:10 +0000)]
Merge "Make changes to MBMS API following recs" into pi-dev
am:
7bedbabd0b
Change-Id: I04bbec845c006659f5ca7eb70e752798a21c2050
Mady Mellor [Sat, 31 Mar 2018 05:03:39 +0000 (05:03 +0000)]
Merge "Add subtype for layout direction to Slice" into pi-dev
am:
703f31db63
Change-Id: I2a9728249f2fac47593075dbe08d54988df82634
Yangster-mac [Sat, 31 Mar 2018 04:52:08 +0000 (04:52 +0000)]
Merge "E2e test for periodic alarm." into pi-dev
am:
46eef8d049
Change-Id: I36f2b86462e098cdd9225f74acf42825c75d536c
Bill Yi [Sat, 31 Mar 2018 04:46:49 +0000 (04:46 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
fbe387ab8f -s ours
Change-Id: I13d2632771ce484fc08ce23ff817159652fccdcc
Makoto Onuki [Sat, 31 Mar 2018 04:45:04 +0000 (04:45 +0000)]
Merge "Log sync enable/disable too" into pi-dev
am:
04ce26d840
Change-Id: I603d461cf83ff33d4ab6f74ee6d68e0795130fcf
TreeHugger Robot [Sat, 31 Mar 2018 04:17:41 +0000 (04:17 +0000)]
Merge "Make changes to MBMS API following recs" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 04:16:35 +0000 (04:16 +0000)]
Merge "Add subtype for layout direction to Slice" into pi-dev
Alan Viverette [Sat, 31 Mar 2018 03:57:02 +0000 (03:57 +0000)]
Merge "Migrate to AAPT2" into pi-dev
am:
11bd1b601e
Change-Id: Ia1221be6801af09823770458cf708eacd369981e
Yi Jin [Sat, 31 Mar 2018 03:50:36 +0000 (03:50 +0000)]
Merge "Correctly use int types and fix uint64_t print." into pi-dev
am:
53f60f60ee
Change-Id: I34562b9ac0ee2a014b744ff786eaa578ed2061d8
Kevin Chyn [Sat, 31 Mar 2018 03:46:16 +0000 (03:46 +0000)]
Merge "Fingerprint user canceled message should not be delayed" into pi-dev
am:
374f6a26f9
Change-Id: Ibefdb50b12d74d1158a5ed91aaaf12b18310ab61
Makoto Onuki [Sat, 31 Mar 2018 03:41:50 +0000 (03:41 +0000)]
Merge "Fix erroneous protected-broadcast check" into pi-dev
am:
8c6aa94346
Change-Id: I42e5193e8710c4a04adb9ff66d2be21050627b3e
Chenjie Yu [Sat, 31 Mar 2018 03:37:24 +0000 (03:37 +0000)]
Merge "Null pointer check for Bluetooth traffic" into pi-dev
am:
2f6f33fa79
Change-Id: I25156d66b989d23ccf42e303138fcf5e27cc489e
Nathan Harold [Sat, 31 Mar 2018 03:30:31 +0000 (03:30 +0000)]
[automerger skipped] Disallow Reserved SPI Allocation am:
0f8c8bb01a -s ours
am:
99a9661d51 -s ours
Change-Id: I974bf075bc595d37f6e1358ea9d4cb9b9491dad1
Bookatz [Sat, 31 Mar 2018 03:29:38 +0000 (03:29 +0000)]
Merge "Statsd MAX now obeys refractory periods too" into pi-dev
am:
3b826c6075
Change-Id: I5741106ec3cd5a5d9c7a66796549982936c4f500
Chris Craik [Sat, 31 Mar 2018 03:25:48 +0000 (03:25 +0000)]
Merge "Document expected colors, deprecate old ones" into pi-dev am:
dbd39fc619
am:
8992dfe3c2
Change-Id: Ifcbc449fa74fdfab9ef1430cc9e911dbe1ac5006
Brad Ebinger [Sat, 31 Mar 2018 03:21:05 +0000 (03:21 +0000)]
Merge "Unhide @SystemApi Constructor" into pi-dev am:
77fcc0da3b
am:
cf49f62de5
Change-Id: I704459fc125cfda6b40f6ec96cd40f70d09a6aab
Bo Zhu [Sat, 31 Mar 2018 03:16:47 +0000 (03:16 +0000)]
Merge "Expose e.getMessage() from the exceptions in RecoverableKeyStore" into pi-dev
am:
8b60ebc6a6
Change-Id: Ie98c772deea51c25b075a92e2021257f41daf712
Yangster-mac [Sat, 31 Mar 2018 03:16:37 +0000 (03:16 +0000)]
Merge "Guardrail for dimension in condition in duration tracker." into pi-dev am:
014432cb67
am:
2a5d9a6fef
Change-Id: I8e2bdad5e16d4d6ed9918ccc9149aa296211c6ba
Suprabh Shukla [Sat, 31 Mar 2018 03:11:13 +0000 (03:11 +0000)]
Merge "Adding LauncherApps apis for suspended packages" into pi-dev
am:
a6d6a5aa79
Change-Id: I2eb805342fc07944042b4668429a1a3f909cec2a
Evan Rosky [Sat, 31 Mar 2018 03:06:38 +0000 (03:06 +0000)]
Merge "Restored focusableViewAvailable logic on visibility change" into pi-dev am:
4d0a5fd7e7
am:
759d87a01f
Change-Id: I33ab28d6a89966b8ea59ddc1b3031e0bb6b9311c
Jason Monk [Sat, 31 Mar 2018 03:05:38 +0000 (03:05 +0000)]
Merge "Add some methods to manage slice permissios" into pi-dev
am:
35201a6af2
Change-Id: I83f2d375465479e3f4f8af3790c5d42cf20d1c49
TreeHugger Robot [Sat, 31 Mar 2018 03:04:59 +0000 (03:04 +0000)]
Merge "E2e test for periodic alarm." into pi-dev
Amin Shaikh [Sat, 31 Mar 2018 03:02:19 +0000 (03:02 +0000)]
Merge "Control the QS label marquees." into pi-dev am:
b17c2388a5
am:
c3e00577e6
Change-Id: Id9ea9aaba47b78ce65244bd769dee01f2261ff1e
Kevin Chyn [Sat, 31 Mar 2018 03:00:00 +0000 (03:00 +0000)]
Merge "Clear fingerprint stats after dump --proto" into pi-dev
am:
0d1debfcff
Change-Id: I213047cf6d62c747c16d8670da3781581f609841
Android Build Merger (Role) [Sat, 31 Mar 2018 02:55:42 +0000 (02:55 +0000)]
Merge "Merge "Make changes to MBMS API following recs" am:
feb60e0864 am:
2fa2a9d06f" into pi-dev-plus-aosp
Hall Liu [Sat, 31 Mar 2018 02:54:39 +0000 (02:54 +0000)]
Merge "Make changes to MBMS API following recs" am:
feb60e0864
am:
2fa2a9d06f
Change-Id: I3b1aef24454fa45ffbbf6bb003743e662eac0353
rago [Sat, 31 Mar 2018 02:53:00 +0000 (02:53 +0000)]
Merge "Dynamics Processing Effect" into pi-dev
am:
d41d56e348
Change-Id: I192dc1b2b980b698695f31f0d1777f9c8c425cfb
Tarandeep Singh [Sat, 31 Mar 2018 02:52:26 +0000 (02:52 +0000)]
Merge "Disable optimize startInput in IMMS" into pi-dev am:
d44712584a
am:
fd0169ef39
Change-Id: I65d0e9882f9e6a9df8e29e07a683e3ba340eb8e4
TreeHugger Robot [Sat, 31 Mar 2018 02:51:37 +0000 (02:51 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Rohan Shah [Sat, 31 Mar 2018 02:48:05 +0000 (02:48 +0000)]
Merge "Revert "[Notif] Disable "Customize" for blocking helper"" into pi-dev am:
13c78d15d8
am:
7cc9d8a41d
Change-Id: I23fe385bc902aec098a30e61b43dfe4400a3ad32
John Reck [Sat, 31 Mar 2018 02:46:22 +0000 (02:46 +0000)]
Merge "Fix regression to drawBitmapArray" into pi-dev
am:
a26795a884
Change-Id: I1d9109dc95ec9b99f097bf5f34cdb036373f2332
Amin Shaikh [Sat, 31 Mar 2018 02:43:47 +0000 (02:43 +0000)]
Merge "Update QS edit layout." into pi-dev am:
6a8ea4fe24
am:
0c9cedd8ad
Change-Id: I845e889fc234d1c6f2639be515f452fcfc8d1cf0
Pavlin Radoslavov [Sat, 31 Mar 2018 02:41:16 +0000 (02:41 +0000)]
[automerger skipped] Merge "Update Bluetooth codec related strings" am:
d10fd55a91
am:
856fe46a69 -s ours
Change-Id: I01f8230057325a652a4d690cad500429673ef7db
Howard Ro [Sat, 31 Mar 2018 02:39:55 +0000 (02:39 +0000)]
Merge "Remove bad configs by counting the number of statsd deaths" into pi-dev am:
ea16812ad2
am:
2720c9ef26
Change-Id: Ia492862b87f4cd7739d78230272839fa3caba9c4
Hall Liu [Sat, 31 Mar 2018 02:36:45 +0000 (02:36 +0000)]
Merge "Make changes to MBMS API following recs"
am:
feb60e0864
Change-Id: I748bdcb23538f7c5e5d9bcc005df32fddd42602a
Xiangyu/Malcolm Chen [Sat, 31 Mar 2018 02:36:05 +0000 (02:36 +0000)]
Merge "Adding debug message inside NetworkServiceCallback." into pi-dev
am:
17d19b7d52
Change-Id: Icfec1153ed29ae096083d3260294b7b580e0285e
Yi Jin [Sat, 31 Mar 2018 02:35:52 +0000 (02:35 +0000)]
Merge "Use unique_fd with the clear ownership." into pi-dev am:
1ebfc94aa1
am:
29bcccc579
Change-Id: Ic14b88d76560812fe2cc3d0ed9c23a32ffc233b0
Chenjie Yu [Sat, 31 Mar 2018 02:27:56 +0000 (02:27 +0000)]
Merge "Clean up atoms.proto" into pi-dev am:
9fef2594f3
am:
622b392c20
Change-Id: I6cb3f225714c742e5f2c294babc964f65e2ccc8f
Rahul Frias [Sat, 31 Mar 2018 02:23:22 +0000 (02:23 +0000)]
Merge "Clarified app behavior on REQUEST_TYPE_NONE" into pi-dev am:
1b7162ad3d
am:
02c7881824
Change-Id: I7c553068bc702f822006e0445e5e0e35dc7db157
TreeHugger Robot [Sat, 31 Mar 2018 02:19:34 +0000 (02:19 +0000)]
Merge "Log sync enable/disable too" into pi-dev
Benedict Wong [Sat, 31 Mar 2018 02:19:16 +0000 (02:19 +0000)]
[automerger skipped] Merge changes from topic "encap-api" into pi-dev am:
36f2d8a4e1 -s ours
am:
d3b9df79e3 -s ours
Change-Id: I9e585b4b1064719e5a151537496b2021c8d29a8e
Benedict Wong [Sat, 31 Mar 2018 02:14:34 +0000 (02:14 +0000)]
Merge "[automerger skipped] Require explicitly supplied truncation length am:
bfa67c81bf -s ours" into pi-dev-plus-aosp
am:
bdad02b32b -s ours
Change-Id: I2ebfb8ff36a53565d41c464b6e1e259e6a2ffc72
Alan Viverette [Sat, 31 Mar 2018 02:11:59 +0000 (02:11 +0000)]
Merge "Migrate to AAPT2" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 02:08:12 +0000 (02:08 +0000)]
Merge "Correctly use int types and fix uint64_t print." into pi-dev
Ruchi Kandoi [Sat, 31 Mar 2018 01:58:59 +0000 (01:58 +0000)]
Merge "Make OMAPI stricter" am:
998ef794a3
am:
43056194a5
Change-Id: I7d19c85a4068ff2cab66f316689fcc25501133c2
TreeHugger Robot [Sat, 31 Mar 2018 01:52:37 +0000 (01:52 +0000)]
Merge "Fingerprint user canceled message should not be delayed" into pi-dev
Benedict Wong [Sat, 31 Mar 2018 01:49:32 +0000 (01:49 +0000)]
[automerger skipped] Require explicitly supplied truncation length am:
bfa67c81bf -s ours
am:
793f5bb428 -s ours
Change-Id: Id2e4b9be42efc88d199974edc65687c37b52aa59
Daniel Cashman [Sat, 31 Mar 2018 01:47:15 +0000 (01:47 +0000)]
Merge "Require signing cert history certs to be unique." into pi-dev
am:
d05c00fbb6
Change-Id: I003d18660bc920de1bb2378a46836790753447f2
Pavlin Radoslavov [Sat, 31 Mar 2018 01:46:33 +0000 (01:46 +0000)]
Merge "Update Bluetooth codec related strings"
am:
d10fd55a91
Change-Id: Ie28703025f732e33abeac2e7d8121bc93eaa3db9
Ruchi Kandoi [Sat, 31 Mar 2018 01:43:18 +0000 (01:43 +0000)]
Merge "Make OMAPI stricter"
am:
998ef794a3
Change-Id: I34232eea503b3d95b22d4a8fa9e366c857264e78
TreeHugger Robot [Sat, 31 Mar 2018 01:41:57 +0000 (01:41 +0000)]
Merge "Fix erroneous protected-broadcast check" into pi-dev
Brian C. Young [Sat, 31 Mar 2018 01:39:51 +0000 (01:39 +0000)]
Merge "Remove getCurrentUser call to find an alternative" into pi-dev
am:
1b3844cb84
Change-Id: Id2ae3acaf7ac7af3b5d53703f229c60dd86124ac
Evan Laird [Sat, 31 Mar 2018 01:39:39 +0000 (01:39 +0000)]
Merge "Merge "Remove SignalClusterView in favor of IconManager" into pi-dev am:
eff51d566a" into pi-dev-plus-aosp
am:
9d89c35ce4
Change-Id: I94f41aec8240eded9f384f149859db07f75bf303
Calin Juravle [Sat, 31 Mar 2018 01:34:28 +0000 (01:34 +0000)]
Merge "Fix BackgroundDexOptTest" into pi-dev
am:
ddc4e1ab06
Change-Id: Icd564239c493ed402fe9914f52c48da72a3d58db
Paul Jensen [Sat, 31 Mar 2018 01:30:29 +0000 (01:30 +0000)]
Merge "[automerger skipped] Merge "Fix socket leaks in various android.net.Network methods." am:
34ce11f2bd am:
f6ab9a5f96 -s ours" into pi-dev-plus-aosp
am:
ee86dc2737 -s ours
Change-Id: I4782f78435921ac4c9fb091081ae48a95080b89b
Benedict Wong [Sat, 31 Mar 2018 01:30:03 +0000 (01:30 +0000)]
[automerger skipped] Merge "Disallow Reserved SPI Allocation" into pi-dev
am:
35147b2dae -s ours
Change-Id: I80f554392a01a4942b5c4927b8ad13d11dd5490a
TreeHugger Robot [Sat, 31 Mar 2018 01:18:34 +0000 (01:18 +0000)]
Merge "Null pointer check for Bluetooth traffic" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 01:10:57 +0000 (01:10 +0000)]
Merge "Statsd MAX now obeys refractory periods too" into pi-dev
Rohan Shah [Sat, 31 Mar 2018 01:10:23 +0000 (01:10 +0000)]
Merge "[Notif] Disable "Customize" for blocking helper" into pi-dev am:
21ba6eff91
am:
2b1e63ed60
Change-Id: I115ee83285e802263a1bcf8445d6d1b85988ba11
Vishwath Mohan [Sat, 31 Mar 2018 01:05:32 +0000 (01:05 +0000)]
Merge "Don't clear mPattern when clearing visual pattern." into pi-dev am:
74d7f50597
am:
48934218dd
Change-Id: I230b9518e16be582103bcce88d52a4c6e98a1678
OSDN Git Service
