OSDN Git Service
Marie Janssen [Tue, 13 Jun 2017 01:54:18 +0000 (01:54 +0000)]
Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am:
68a4c91bb4 am:
2ddb92f2d9" into oc-dr1-dev-plus-aosp
am:
d681a81d89
Change-Id: Ic8891f09e36a7610418c8168722628e60c079131
Wale Ogunwale [Tue, 13 Jun 2017 01:51:59 +0000 (01:51 +0000)]
Merge "Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am:
e1e0db8ca9 am:
5323b2d4cd" into oc-dr1-dev-plus-aosp
am:
1324c577e7
Change-Id: If243540cf28bd67bd659c1647c1b175ff72daba3
Marie Janssen [Tue, 13 Jun 2017 01:49:30 +0000 (01:49 +0000)]
Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am:
68a4c91bb4 am:
4c342c8a98" into oc-dr1-dev-plus-aosp
am:
61c6f9f204
Change-Id: I883466888853a4914c87ab99ec81795d2af95123
Tianjie Xu [Tue, 13 Jun 2017 01:46:53 +0000 (01:46 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am:
f40f297546 am:
c7fed42403
am:
6284825f22
Change-Id: I4995070433e9f35a30e47aaf7045eeb14d31dc5b
Pankaj Kanwar [Tue, 13 Jun 2017 01:41:30 +0000 (01:41 +0000)]
Merge "Merge "Address IMSI privacy issues." am:
ef6b81e5b2 am:
91a4d3df01 am:
3f095ca368" into oc-dr1-dev-plus-aosp
am:
a109b25895
Change-Id: Id04d5216beac797f4086916f0fdfefd23c2007cd
Wale Ogunwale [Tue, 13 Jun 2017 01:38:47 +0000 (01:38 +0000)]
Merge "Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am:
e1e0db8ca9 am:
90159a2492" into oc-dr1-dev-plus-aosp
am:
e17ea3eb21
Change-Id: I244f3d4af910c73b4c402dd0e93d92bd6ead849e
Robert Carr [Tue, 13 Jun 2017 01:36:05 +0000 (01:36 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am:
42b3610adc am:
aec6b4749a
am:
00c2e52c6f
Change-Id: I119bd9a2828c91c25622e4d2c93e8579bbc63726
Jorim Jaggi [Tue, 13 Jun 2017 01:33:46 +0000 (01:33 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev am:
bbd7dfc0a4 am:
20eb74681f
am:
bda5530d2a
Change-Id: I2f2b93c2c06a52fbed7b26ece806c7bc88238527
Jeff Sharkey [Tue, 13 Jun 2017 01:30:52 +0000 (01:30 +0000)]
Merge "Merge "Improve developer docs for storage APIs." into oc-dev am:
05b52d8ba5 am:
0ba24ed694" into oc-dr1-dev-plus-aosp
am:
fd79a77d7b
Change-Id: Iee648e63d925e4ae1a1df72f9d0fb26b8cf1c5dd
Todd Kennedy [Tue, 13 Jun 2017 01:28:19 +0000 (01:28 +0000)]
Merge "Merge "Don't log all instant app resolutions" into oc-dev am:
3ef0b8260f am:
f734de79cc" into oc-dr1-dev-plus-aosp
am:
f1e10a96b9
Change-Id: I6250095f0522d044b62ae3d660d8446f2107d7cd
Tianjie Xu [Tue, 13 Jun 2017 01:25:33 +0000 (01:25 +0000)]
Merge "Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am:
f40f297546 am:
d04d501ce7" into oc-dr1-dev-plus-aosp
am:
1fa1f100a3
Change-Id: I0f0da929e78146408def47e03ae9f2425849d7e9
Vladislav Kaznacheev [Tue, 13 Jun 2017 01:23:10 +0000 (01:23 +0000)]
Merge "Merge changes from topic 'sysui-tooltip' into oc-dev am:
3fbcec5b86 am:
bc168cf9d5" into oc-dr1-dev-plus-aosp
am:
e1f07567b5
Change-Id: Id519ecd8009af784e7f4d087c2beca0bc854d9cf
Android Build Merger (Role) [Tue, 13 Jun 2017 01:19:42 +0000 (01:19 +0000)]
Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am:
68a4c91bb4 am:
2ddb92f2d9" into oc-dr1-dev-plus-aosp
Marie Janssen [Tue, 13 Jun 2017 01:18:53 +0000 (01:18 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev am:
68a4c91bb4
am:
2ddb92f2d9
Change-Id: Iede1ea0f5f9409538295b3861e2343647ba51026
Android Build Merger (Role) [Tue, 13 Jun 2017 01:18:26 +0000 (01:18 +0000)]
Merge "Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am:
e1e0db8ca9 am:
5323b2d4cd" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Tue, 13 Jun 2017 01:17:33 +0000 (01:17 +0000)]
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am:
e1e0db8ca9
am:
5323b2d4cd
Change-Id: I659c818c815b46d666986b1a1224fd4d4f57e56e
Android Build Merger (Role) [Tue, 13 Jun 2017 01:17:15 +0000 (01:17 +0000)]
Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am:
68a4c91bb4 am:
4c342c8a98" into oc-dr1-dev-plus-aosp
Tianjie Xu [Tue, 13 Jun 2017 01:14:58 +0000 (01:14 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am:
f40f297546
am:
c7fed42403
Change-Id: I196fe22ce901383f3349b99823f066d1226fa4fb
Marie Janssen [Tue, 13 Jun 2017 01:14:33 +0000 (01:14 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev am:
68a4c91bb4
am:
4c342c8a98
Change-Id: Ia608d4af6afda14097a94013bf2dbe64962ebd74
Robert Carr [Tue, 13 Jun 2017 01:13:37 +0000 (01:13 +0000)]
Merge "Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am:
42b3610adc am:
2fa5800da9" into oc-dr1-dev-plus-aosp
am:
3c63cef6bf
Change-Id: I949b09e52f82ae947789489cff5cffc94d438a68
Android Build Merger (Role) [Tue, 13 Jun 2017 01:10:52 +0000 (01:10 +0000)]
Merge "Merge "Address IMSI privacy issues." am:
ef6b81e5b2 am:
91a4d3df01 am:
3f095ca368" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 13 Jun 2017 01:10:46 +0000 (01:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c2a12b658 -s ours am:
5a3998fe38 -s ours
am:
ed30217c42 -s ours
Change-Id: If8d06784fb6f699ef8e0bb999d0095ee04eff392
Pankaj Kanwar [Tue, 13 Jun 2017 01:09:44 +0000 (01:09 +0000)]
Merge "Address IMSI privacy issues." am:
ef6b81e5b2 am:
91a4d3df01
am:
3f095ca368
Change-Id: I3f9a2f48e8b45b7625c364983b2b3d342e70d5d0
Android Build Merger (Role) [Tue, 13 Jun 2017 01:09:16 +0000 (01:09 +0000)]
Merge "Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am:
e1e0db8ca9 am:
90159a2492" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Tue, 13 Jun 2017 01:08:25 +0000 (01:08 +0000)]
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am:
e1e0db8ca9
am:
90159a2492
Change-Id: I0092411f5b8bef853b55e6ffe7bdf700876f7715
Will Brazil [Tue, 13 Jun 2017 01:08:04 +0000 (01:08 +0000)]
Merge "Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am:
71029bf631 am:
938fe5c968" into oc-dr1-dev-plus-aosp
am:
4fabf266b7
Change-Id: I10973ffac696d28d300d00d9261f2d05502c5c00
Robert Carr [Tue, 13 Jun 2017 01:06:32 +0000 (01:06 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am:
42b3610adc
am:
aec6b4749a
Change-Id: Ic8bbda9b2fc76253c70e9f5cd15d6a32b212b50d
Jorim Jaggi [Tue, 13 Jun 2017 01:05:09 +0000 (01:05 +0000)]
Merge "Merge "Attempted fix for navigation bar flicker" into oc-dev am:
bbd7dfc0a4 am:
78c9744f41" into oc-dr1-dev-plus-aosp
am:
8f76d06c94
Change-Id: Ibba2531d1fbf0b440fb19672b60938dd93cd40e2
Marie Janssen [Tue, 13 Jun 2017 01:04:55 +0000 (01:04 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev
am:
68a4c91bb4
Change-Id: Ifdb4b625f21dcda5248071263aaf6936158efb39
Wale Ogunwale [Tue, 13 Jun 2017 01:01:51 +0000 (01:01 +0000)]
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
am:
e1e0db8ca9
Change-Id: I2d854e36c31a8fa1cf74e5c5a536969ee94dc79b
Marie Janssen [Tue, 13 Jun 2017 01:01:23 +0000 (01:01 +0000)]
Merge "Merge "Protect broadcast used in settings for bond cancel" am:
5cfbbce162 am:
00bce50dc3 am:
297dbb86fe" into oc-dr1-dev-plus-aosp
am:
1270b399cc
Change-Id: I77469544f4cd29f2393e4310ff83ed1da4d5ecfe
Tianjie Xu [Tue, 13 Jun 2017 00:58:53 +0000 (00:58 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
am:
f40f297546
Change-Id: Id60cf7cf4b82f17fd094fa011bb54a543e636f48
Jeff Sharkey [Tue, 13 Jun 2017 00:57:38 +0000 (00:57 +0000)]
Merge "Merge "Improve developer docs for storage APIs." into oc-dev am:
05b52d8ba5 am:
f96c9a0fa2" into oc-dr1-dev-plus-aosp
am:
08b598fcfe
Change-Id: I6dd330a240f1725b59e79111fd3bfc124a3fb897
Todd Kennedy [Tue, 13 Jun 2017 00:54:49 +0000 (00:54 +0000)]
Merge "Merge "Don't log all instant app resolutions" into oc-dev am:
3ef0b8260f am:
5ca9d413f8" into oc-dr1-dev-plus-aosp
am:
6c240e311b
Change-Id: If93120172fb811743d876984e2622d09e9c0e1a2
Jorim Jaggi [Tue, 13 Jun 2017 00:54:18 +0000 (00:54 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev am:
bbd7dfc0a4
am:
20eb74681f
Change-Id: I9dc34fe898c8ce9f5c1babfa73bf619c0e69a494
Robert Carr [Tue, 13 Jun 2017 00:54:10 +0000 (00:54 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
am:
42b3610adc
Change-Id: I3238399a26917f80bd4e33bb20142f62076e6f4f
Marie Janssen [Tue, 13 Jun 2017 00:51:09 +0000 (00:51 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev
am:
68a4c91bb4
Change-Id: I3dc46eca98c859c540d528cb8a4a409587a25383
Vladislav Kaznacheev [Tue, 13 Jun 2017 00:49:47 +0000 (00:49 +0000)]
Merge "Merge changes from topic 'sysui-tooltip' into oc-dev am:
3fbcec5b86 am:
7e21054200" into oc-dr1-dev-plus-aosp
am:
4c4cf27212
Change-Id: Ibef05a31f18d50b5460af1c23f676e061ad81e6c
Android Build Merger (Role) [Tue, 13 Jun 2017 00:49:12 +0000 (00:49 +0000)]
Merge "Merge "Improve developer docs for storage APIs." into oc-dev am:
05b52d8ba5 am:
0ba24ed694" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Tue, 13 Jun 2017 00:48:06 +0000 (00:48 +0000)]
Merge "Improve developer docs for storage APIs." into oc-dev am:
05b52d8ba5
am:
0ba24ed694
Change-Id: I8a33e050caba8a7f80b64709174a867a50857571
Android Build Merger (Role) [Tue, 13 Jun 2017 00:47:37 +0000 (00:47 +0000)]
Merge "Merge "Don't log all instant app resolutions" into oc-dev am:
3ef0b8260f am:
f734de79cc" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Jun 2017 00:47:18 +0000 (00:47 +0000)]
Merge "Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am:
f40f297546 am:
d04d501ce7" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 13 Jun 2017 00:47:23 +0000 (00:47 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c2a12b658 -s ours am:
e887d21330 -s ours" into oc-dr1-dev-plus-aosp
am:
29f0c7bb81 -s ours
Change-Id: I1d4fd8e29f86269ea51ad1d1f996fcf108649a62
Todd Kennedy [Tue, 13 Jun 2017 00:46:50 +0000 (00:46 +0000)]
Merge "Don't log all instant app resolutions" into oc-dev am:
3ef0b8260f
am:
f734de79cc
Change-Id: Ie507e44ad423296de9ab545c1afcd881273b30e1
Android Build Merger (Role) [Tue, 13 Jun 2017 00:46:20 +0000 (00:46 +0000)]
Merge "Merge changes from topic 'sysui-tooltip' into oc-dev am:
3fbcec5b86 am:
bc168cf9d5" into oc-dr1-dev-plus-aosp
Tianjie Xu [Tue, 13 Jun 2017 00:46:27 +0000 (00:46 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am:
f40f297546
am:
d04d501ce7
Change-Id: Ide407c6ccc5a42c9a57acb1652b19db99bee42a8
Android Build Merger (Role) [Tue, 13 Jun 2017 00:45:55 +0000 (00:45 +0000)]
Merge "Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am:
42b3610adc am:
2fa5800da9" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Tue, 13 Jun 2017 00:45:40 +0000 (00:45 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev
Vladislav Kaznacheev [Tue, 13 Jun 2017 00:45:32 +0000 (00:45 +0000)]
Merge changes from topic 'sysui-tooltip' into oc-dev am:
3fbcec5b86
am:
bc168cf9d5
Change-Id: I5b2320564692df6fa14bfeb49fcf350fc4cb2d9d
Pankaj Kanwar [Tue, 13 Jun 2017 00:45:04 +0000 (00:45 +0000)]
Merge "Address IMSI privacy issues." am:
ef6b81e5b2
am:
91a4d3df01
Change-Id: I15e60cbbff06d7f66e86d755ae87b2e3513ca4a9
Jorim Jaggi [Tue, 13 Jun 2017 00:45:02 +0000 (00:45 +0000)]
Merge "Merge "resolve merge conflicts of
8f1d13300f73 to oc-dr1-dev" into oc-dr1-dev am:
c14f46b135" into oc-dr1-dev-plus-aosp
am:
7fbd6a02dd
Change-Id: I3baf62e4e287b3aff3ee2def1becdfe6c795d02f
Robert Carr [Tue, 13 Jun 2017 00:43:56 +0000 (00:43 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am:
42b3610adc
am:
2fa5800da9
Change-Id: I83c4a2e592b7385b1aa6dc3157bd6ea5950c624a
Bill Yi [Tue, 13 Jun 2017 00:43:00 +0000 (00:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c2a12b658 -s ours
am:
5a3998fe38 -s ours
Change-Id: Ic55a5b3c7cc13af454abc3fbb4f1dba7be64d107
Jorim Jaggi [Tue, 13 Jun 2017 00:41:40 +0000 (00:41 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev
am:
bbd7dfc0a4
Change-Id: I80a618eb59f0479060a69ca4f0be8ac883a8d48d
Android Build Merger (Role) [Tue, 13 Jun 2017 00:39:21 +0000 (00:39 +0000)]
Merge "Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am:
71029bf631 am:
938fe5c968" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Jun 2017 00:39:07 +0000 (00:39 +0000)]
Merge "Merge "Attempted fix for navigation bar flicker" into oc-dev am:
bbd7dfc0a4 am:
78c9744f41" into oc-dr1-dev-plus-aosp
Will Brazil [Tue, 13 Jun 2017 00:38:29 +0000 (00:38 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am:
71029bf631
am:
938fe5c968
Change-Id: I147dea17afffba890b5bb3108d061bdf4f7c76f7
Jorim Jaggi [Tue, 13 Jun 2017 00:38:04 +0000 (00:38 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev am:
bbd7dfc0a4
am:
78c9744f41
Change-Id: I985f319bb1cf6627abef2a7dafd9fafd64309264
Android Build Merger (Role) [Tue, 13 Jun 2017 00:37:39 +0000 (00:37 +0000)]
Merge "Merge "Protect broadcast used in settings for bond cancel" am:
5cfbbce162 am:
00bce50dc3 am:
297dbb86fe" into oc-dr1-dev-plus-aosp
Pankaj Kanwar [Tue, 13 Jun 2017 00:37:13 +0000 (00:37 +0000)]
Merge "Address IMSI privacy issues."
am:
ef6b81e5b2
Change-Id: I41c06fc9bf9012f93e10b59c49d5a7314331ea5f
Will Brazil [Tue, 13 Jun 2017 00:36:59 +0000 (00:36 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am:
71029bf631 am:
5884f6ce0d
am:
308a19531e
Change-Id: I2db2e50ac8ca7b85429271eb649a2698041d1df0
Marie Janssen [Tue, 13 Jun 2017 00:36:46 +0000 (00:36 +0000)]
Merge "Protect broadcast used in settings for bond cancel" am:
5cfbbce162 am:
00bce50dc3
am:
297dbb86fe
Change-Id: I630bc69705870d4cd7252da9bc8501c564950393
Android Build Merger (Role) [Tue, 13 Jun 2017 00:36:12 +0000 (00:36 +0000)]
Merge "Merge "Improve developer docs for storage APIs." into oc-dev am:
05b52d8ba5 am:
f96c9a0fa2" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Tue, 13 Jun 2017 00:36:09 +0000 (00:36 +0000)]
Merge "Improve developer docs for storage APIs." into oc-dev
am:
05b52d8ba5
Change-Id: I282786d353e3dc406c7123daa00d3e7fe43de7bc
Jeff Sharkey [Tue, 13 Jun 2017 00:35:13 +0000 (00:35 +0000)]
Merge "Improve developer docs for storage APIs." into oc-dev am:
05b52d8ba5
am:
f96c9a0fa2
Change-Id: Ifef4156412f88e1d7bc3d8bbccaca6d0177c7245
Android Build Merger (Role) [Tue, 13 Jun 2017 00:34:43 +0000 (00:34 +0000)]
Merge "Merge "Don't log all instant app resolutions" into oc-dev am:
3ef0b8260f am:
5ca9d413f8" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Tue, 13 Jun 2017 00:34:49 +0000 (00:34 +0000)]
Merge "resolve merge conflicts of
963fed0345c5 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
am:
827dfe078f
Change-Id: Ibe3a988346ab28f5e74286d327194e2e9f2a67fd
Todd Kennedy [Tue, 13 Jun 2017 00:33:51 +0000 (00:33 +0000)]
Merge "Don't log all instant app resolutions" into oc-dev
am:
3ef0b8260f
Change-Id: I4ef141816c67957b0302be814315e2e739406c31
Todd Kennedy [Tue, 13 Jun 2017 00:33:45 +0000 (00:33 +0000)]
Merge "Don't log all instant app resolutions" into oc-dev am:
3ef0b8260f
am:
5ca9d413f8
Change-Id: I10e7c59edb955ba537a12bd52f7117b382d46d7f
Android Build Merger (Role) [Tue, 13 Jun 2017 00:33:14 +0000 (00:33 +0000)]
Merge "Merge changes from topic 'sysui-tooltip' into oc-dev am:
3fbcec5b86 am:
7e21054200" into oc-dr1-dev-plus-aosp
Vladislav Kaznacheev [Tue, 13 Jun 2017 00:32:20 +0000 (00:32 +0000)]
Merge changes from topic 'sysui-tooltip' into oc-dev am:
3fbcec5b86
am:
7e21054200
Change-Id: Icfe6bb79c13c6e0ef925f30933f7831978a2886c
Android Build Merger (Role) [Tue, 13 Jun 2017 00:31:48 +0000 (00:31 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c2a12b658 -s ours am:
e887d21330 -s ours" into oc-dr1-dev-plus-aosp
Vladislav Kaznacheev [Tue, 13 Jun 2017 00:31:02 +0000 (00:31 +0000)]
Merge changes from topic 'sysui-tooltip' into oc-dev
am:
3fbcec5b86
Change-Id: I7affdad6abfb283c0eec6718797f7d8580ea507b
Android Build Merger (Role) [Tue, 13 Jun 2017 00:30:24 +0000 (00:30 +0000)]
Merge "Merge "resolve merge conflicts of
8f1d13300f73 to oc-dr1-dev" into oc-dr1-dev am:
c14f46b135" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Tue, 13 Jun 2017 00:29:15 +0000 (00:29 +0000)]
Merge "resolve merge conflicts of
8f1d13300f73 to oc-dr1-dev" into oc-dr1-dev
am:
c14f46b135
Change-Id: Iaab3c2094a3f2e905097f47ed24276cc412d0b93
Bill Yi [Tue, 13 Jun 2017 00:29:07 +0000 (00:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c2a12b658 -s ours
am:
e887d21330 -s ours
Change-Id: Ie236dae37b227cf65c837e0efea1ea1f9e9aa9b3
Pankaj Kanwar [Tue, 13 Jun 2017 00:28:42 +0000 (00:28 +0000)]
Merge "Address IMSI privacy issues."
Bill Yi [Tue, 13 Jun 2017 00:27:05 +0000 (00:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7c2a12b658 -s ours
Change-Id: I5f257f746717037d275e025c80581d1f4cccc67d
Will Brazil [Tue, 13 Jun 2017 00:26:49 +0000 (00:26 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am:
71029bf631
am:
5884f6ce0d
Change-Id: I725739aed3207992022aa500bb99072410a9a305
Jeff Sharkey [Tue, 13 Jun 2017 00:24:59 +0000 (00:24 +0000)]
Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev am:
f7dc56ecc9
am:
de624f3fbb
Change-Id: I0a125a6c00220ba280dca4e0d8ece88202a68afe
Will Brazil [Tue, 13 Jun 2017 00:24:40 +0000 (00:24 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev
am:
71029bf631
Change-Id: I99c6322d7e06262861eb0bb8be4ce8d4572ffbae
Jorim Jaggi [Tue, 13 Jun 2017 00:21:21 +0000 (00:21 +0000)]
Merge "resolve merge conflicts of
8f1d13300f73 to oc-dr1-dev" into oc-dr1-dev
Jorim Jaggi [Tue, 13 Jun 2017 00:20:35 +0000 (00:20 +0000)]
Merge "resolve merge conflicts of
963fed0345c5 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Tue, 13 Jun 2017 00:14:55 +0000 (00:14 +0000)]
Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev
am:
f7dc56ecc9
Change-Id: Ic66cdb0548cf8c973214364843cf147ac5d231be
pkanwar [Tue, 21 Feb 2017 03:23:55 +0000 (19:23 -0800)]
Address IMSI privacy issues.
Added getCarrierInfoForImsiEncryption and
setCarrierInfoForImsiEncryption methods.
CP from Master
Bug:
35606429
Test: runtest --path ..ImsiEncryptionInfoTest.java
Change-Id: I62bdc8ac5e57b749fc5675c28579ec2d9183643d
Tarandeep Singh [Tue, 13 Jun 2017 00:12:02 +0000 (00:12 +0000)]
Merge "SearchView focus should be preserved in split-screen."
Jeff Sharkey [Tue, 13 Jun 2017 00:09:45 +0000 (00:09 +0000)]
Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev
Wale Ogunwale [Tue, 13 Jun 2017 00:02:11 +0000 (00:02 +0000)]
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
am:
e1e0db8ca9
Change-Id: Ie70addce27b9551323d7c9d8f9576aa118b98114
TreeHugger Robot [Tue, 13 Jun 2017 00:00:41 +0000 (00:00 +0000)]
Merge "AAPT2: Clean up tests a bit"
Tianjie Xu [Mon, 12 Jun 2017 23:55:23 +0000 (23:55 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
am:
f40f297546
Change-Id: I06fa703be593348db7eed68e3905929262e43a9c
Wale Ogunwale [Mon, 12 Jun 2017 23:51:13 +0000 (23:51 +0000)]
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
Robert Carr [Mon, 12 Jun 2017 23:45:37 +0000 (23:45 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
am:
42b3610adc
Change-Id: Ib1001156c0a68f695d755da51af5f0548ccbacba
TreeHugger Robot [Mon, 12 Jun 2017 23:41:57 +0000 (23:41 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
TreeHugger Robot [Mon, 12 Jun 2017 23:38:14 +0000 (23:38 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
Anthony Chen [Mon, 12 Jun 2017 23:27:48 +0000 (23:27 +0000)]
Merge "Handle night mode for notifications."
Jorim Jaggi [Mon, 12 Jun 2017 23:07:19 +0000 (23:07 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev
am:
bbd7dfc0a4
Change-Id: I66814b15777b180596fd91ac8906f9df698a2d19
TreeHugger Robot [Mon, 12 Jun 2017 23:01:15 +0000 (23:01 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev
Marie Janssen [Mon, 12 Jun 2017 22:57:58 +0000 (22:57 +0000)]
Merge "Protect broadcast used in settings for bond cancel" am:
5cfbbce162
am:
00bce50dc3
Change-Id: I4235d63f1c9aeb3be8b276c082d707e20f8c1d9a
Tyler Gunn [Mon, 12 Jun 2017 22:53:17 +0000 (22:53 +0000)]
Merge changes from topic 'ims-handover-api' into oc-dr1-dev am:
e15da2649b
am:
0d14298f80
Change-Id: Ic21cc388f95e04d47ef93f522412bccfce49d58e
Marie Janssen [Fri, 9 Jun 2017 23:38:19 +0000 (16:38 -0700)]
Protect broadcast used in settings for bond cancel
Test: cancel pairing from notification tray
Bug:
62094630
Change-Id: Ia83a874c1ea9a1d9d5502609f81e94052bb5759c
(cherry picked from commit
977992f3fc9f4f6bb2d1f9536143327a6021c5d1)