OSDN Git Service
Jack Yu [Tue, 7 Feb 2017 00:08:12 +0000 (00:08 +0000)]
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am:
84f97e21b2 am:
7eac8ec7c1
am:
84e84a73b7
Change-Id: I9aab25b14a5774ff5c7d64c5bc6a8aa5490d9ec0
Tyler Gunn [Tue, 7 Feb 2017 00:05:09 +0000 (00:05 +0000)]
Merge "Self managed CS implementation." am:
d736a6b2c2 am:
6bd991b3d2
am:
6a643c3a60
Change-Id: I43f59846ecc7601730aa3a15b106292d7ace0df0
Jack Yu [Tue, 7 Feb 2017 00:04:04 +0000 (00:04 +0000)]
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am:
84f97e21b2
am:
7eac8ec7c1
Change-Id: I8fdb5f13a50a0965cb2fbfd15212bc26e076054c
Tyler Gunn [Tue, 7 Feb 2017 00:01:04 +0000 (00:01 +0000)]
Merge "Self managed CS implementation." am:
d736a6b2c2
am:
6bd991b3d2
Change-Id: Id406ceb476573d3cebc12ce27652d814dd679733
Justin Klaassen [Mon, 6 Feb 2017 23:28:37 +0000 (23:28 +0000)]
Merge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev
am:
1f56b60981
Change-Id: I63139d266461878a666527bd1798f621b1278bf6
Justin Klaassen [Mon, 6 Feb 2017 23:28:27 +0000 (23:28 +0000)]
Remove experimental twilight-based automatic brightness
am:
614f40ea01
Change-Id: I1b0ec1645f38892adb894900b3b3725fc0b23452
TreeHugger Robot [Mon, 6 Feb 2017 23:21:01 +0000 (23:21 +0000)]
Merge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev
Aaron Whyte [Mon, 6 Feb 2017 23:07:16 +0000 (23:07 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev am:
50fa8ad424
am:
95f418cc52
Change-Id: I5baa412f0a080626ccdd0d087809f8d30ef511ab
Ying Wai (Daniel) Fan [Mon, 6 Feb 2017 23:06:19 +0000 (23:06 +0000)]
Prevent division-by-zero error when calculating battery capacity. am:
415f8b32e8
am:
b87f8900ce
Change-Id: I460d08b7c28a180584cf855e5e5220c6596d8a77
Aaron Whyte [Mon, 6 Feb 2017 23:02:58 +0000 (23:02 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev am:
50fa8ad424
am:
567cfb01b4
Change-Id: I132c3018587e4c2b5766b53c1536494ce1e39f89
Ying Wai (Daniel) Fan [Mon, 6 Feb 2017 23:02:08 +0000 (23:02 +0000)]
Prevent division-by-zero error when calculating battery capacity. am:
415f8b32e8
am:
63f3dbae3c
Change-Id: I1c97aa2e4c0bbc84c547e4ce3ff98b77c5bba3f4
Aaron Whyte [Mon, 6 Feb 2017 23:00:39 +0000 (23:00 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev
am:
50fa8ad424
Change-Id: Ic5235c90571dc90411570fb16e9003a89e79c183
Ying Wai (Daniel) Fan [Mon, 6 Feb 2017 23:00:35 +0000 (23:00 +0000)]
Prevent division-by-zero error when calculating battery capacity.
am:
415f8b32e8
Change-Id: Ie58c329fa0814111291922b9a669ca181d4a487f
Aaron Whyte [Mon, 6 Feb 2017 22:57:30 +0000 (22:57 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev
am:
50fa8ad424
Change-Id: I3306d389c19a42130bda31cb61bc846207b76c35
Ying Wai (Daniel) Fan [Mon, 6 Feb 2017 22:57:23 +0000 (22:57 +0000)]
Prevent division-by-zero error when calculating battery capacity.
am:
415f8b32e8
Change-Id: I1337db6391a9511df52560e8edb8a09260e27c5f
Aaron Whyte [Mon, 6 Feb 2017 22:49:32 +0000 (22:49 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev
Manu Cornet [Mon, 6 Feb 2017 22:47:34 +0000 (22:47 +0000)]
Merge "2D Recents: use correct layout logic for drawing transition headers" into nyc-mr2-dev
am:
925d862656
Change-Id: I93191bfb1d833134d8afd826c18b0310c7e9c46c
Manu Cornet [Mon, 6 Feb 2017 22:47:28 +0000 (22:47 +0000)]
2D Recents: use correct layout logic for drawing transition headers
am:
de3cfb0c1f
Change-Id: I46c45fed648858212a31e477f46ad25475b0710a
Jack Yu [Mon, 6 Feb 2017 22:47:05 +0000 (22:47 +0000)]
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged"
am:
84f97e21b2
Change-Id: Ib35393c60b0800d21507bd5d8ffe35345e6e6926
Treehugger Robot [Mon, 6 Feb 2017 22:41:10 +0000 (22:41 +0000)]
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged"
Tyler Gunn [Mon, 6 Feb 2017 22:40:39 +0000 (22:40 +0000)]
Merge "Self managed CS implementation."
am:
d736a6b2c2
Change-Id: I9c1a84cade87a208f2e509fb0f32457c64014147
Manu Cornet [Mon, 6 Feb 2017 22:38:31 +0000 (22:38 +0000)]
Merge "2D Recents: use correct layout logic for drawing transition headers" into nyc-mr2-dev
Tyler Gunn [Mon, 6 Feb 2017 22:32:13 +0000 (22:32 +0000)]
Merge "Self managed CS implementation."
Brad Ebinger [Mon, 6 Feb 2017 22:20:02 +0000 (22:20 +0000)]
Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." am:
ed839943e0 am:
b9f4a2d6c1
am:
661689ffb1
Change-Id: I2ce1c8504b50b3466853c1102114ed1b0fe03dc1
Brad Ebinger [Mon, 6 Feb 2017 22:15:07 +0000 (22:15 +0000)]
Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." am:
ed839943e0
am:
b9f4a2d6c1
Change-Id: I0b1850f074b1a014277c485b1ee6b5b5577fb9cd
Brad Ebinger [Mon, 6 Feb 2017 22:10:26 +0000 (22:10 +0000)]
Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices."
am:
ed839943e0
Change-Id: Ib8ed5dbf927300503aba1d97af25703b380c56a4
Jack Yu [Thu, 26 Jan 2017 20:45:57 +0000 (12:45 -0800)]
Renamed voiceNetworkStateChanged and dataNetworkStateChanged
The misleading voiceNetworkStateChanged should be renamed
to networkStateChanged to reflect either voice or data
network changes will trigger this indication.
And dataNetworkStateChanged should be renamed to
dataCallListChanged as well.
Test: Build
Merged-In: Icf20ceb3718794f7aa62650816714ac8679d101a
Change-Id: Icf20ceb3718794f7aa62650816714ac8679d101a
Brad Ebinger [Mon, 6 Feb 2017 22:03:29 +0000 (22:03 +0000)]
Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices."
Paul Lawrence [Mon, 6 Feb 2017 21:01:55 +0000 (21:01 +0000)]
Merge "Expand whitelist" am:
006065fee4 am:
bff26f4bf1
am:
21b2ab9e11
Change-Id: Id6d1e209a677c0a769b7f63744a8471eb8602a7a
Android Build Merger (Role) [Mon, 6 Feb 2017 20:57:31 +0000 (20:57 +0000)]
Merge "Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am:
19dae584ba am:
b06c3ed79e am:
27e4cb2e61" into nyc-mr2-dev-plus-aosp
Paul Lawrence [Mon, 6 Feb 2017 20:57:23 +0000 (20:57 +0000)]
Merge "Expand whitelist" am:
006065fee4
am:
bff26f4bf1
Change-Id: I2ad973c64c858b11628348965e9593f9f85c6dbe
Android Build Merger (Role) [Mon, 6 Feb 2017 20:56:51 +0000 (20:56 +0000)]
Merge "Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am:
19dae584ba am:
b06c3ed79e am:
d27f7a7af7" into nyc-mr2-dev-plus-aosp
Ricardo Loo [Mon, 6 Feb 2017 20:56:50 +0000 (20:56 +0000)]
Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am:
19dae584ba am:
b06c3ed79e
am:
27e4cb2e61
Change-Id: Ibc8cc393c800d6d378f873259043d9434bb3ba6e
Android Build Merger (Role) [Mon, 6 Feb 2017 20:56:27 +0000 (20:56 +0000)]
Merge "docs: Update gluUnProject parameter description. am:
232c4900ac am:
cb6a5fc0f3 am:
07b5cf2fb6" into nyc-mr2-dev-plus-aosp
Ricardo Loo [Mon, 6 Feb 2017 20:56:05 +0000 (20:56 +0000)]
Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am:
19dae584ba am:
b06c3ed79e
am:
d27f7a7af7
Change-Id: I0005fda55383977ac84d370e7562fb7de7156f24
Ricardo Loo [Mon, 6 Feb 2017 20:55:32 +0000 (20:55 +0000)]
docs: Update gluUnProject parameter description. am:
232c4900ac am:
cb6a5fc0f3
am:
07b5cf2fb6
Change-Id: I6da11429be64951a34c3fab33312b90f4513e8d0
Ricardo Loo [Mon, 6 Feb 2017 20:54:54 +0000 (20:54 +0000)]
docs: Update gluUnProject parameter description. am:
232c4900ac am:
cb6a5fc0f3
am:
94122af913
Change-Id: I35080a02989b25efb690183394b02a724e23acd6
Paul Lawrence [Mon, 6 Feb 2017 20:52:49 +0000 (20:52 +0000)]
Merge "Expand whitelist"
am:
006065fee4
Change-Id: I8e370c7afddc4911e3860d62809fd007bac40a0b
Ricardo Loo [Mon, 6 Feb 2017 20:50:57 +0000 (20:50 +0000)]
Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am:
19dae584ba
am:
b06c3ed79e
Change-Id: Ied57792600e4c832455178fab58c73fa51a32d97
Ricardo Loo [Mon, 6 Feb 2017 20:50:48 +0000 (20:50 +0000)]
Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am:
19dae584ba
am:
b06c3ed79e
Change-Id: I97f1b4559b0c8d4eb3709a455e54157fe3a40426
Ricardo Loo [Mon, 6 Feb 2017 20:49:52 +0000 (20:49 +0000)]
docs: Update gluUnProject parameter description. am:
232c4900ac
am:
cb6a5fc0f3
Change-Id: If34955950f76c9ae8a488f57e7e2d3145bd55543
Ricardo Loo [Mon, 6 Feb 2017 20:49:49 +0000 (20:49 +0000)]
docs: Update gluUnProject parameter description. am:
232c4900ac
am:
cb6a5fc0f3
Change-Id: Ied7be460f12d29dd1ce77be724c11b78e2179293
Ricardo Loo [Mon, 6 Feb 2017 20:45:27 +0000 (20:45 +0000)]
Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev
am:
19dae584ba
Change-Id: I401682a35913ed936d124f7265e3e9338335ccee
Ricardo Loo [Mon, 6 Feb 2017 20:45:23 +0000 (20:45 +0000)]
docs: Update gluUnProject parameter description.
am:
232c4900ac
Change-Id: I087f08225229483798997096be428ef89f61d0bb
Treehugger Robot [Mon, 6 Feb 2017 20:43:01 +0000 (20:43 +0000)]
Merge "Expand whitelist"
Ricardo Loo [Mon, 6 Feb 2017 20:37:43 +0000 (20:37 +0000)]
Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev
Tyler Gunn [Mon, 17 Oct 2016 22:48:19 +0000 (15:48 -0700)]
Framework fixes to support VoLTE conf calls via RemoteConnectionServices.
Fixing some issues with the addExistingConnection and addConference APIs
on ConnectionService. When a connection manager relays the addition of
an existing connection or a conference to Telecom, it will assign a new
ID to the new connection/conference. Due to how RemoteCSes work, the
Connection/Conf will be added directly via TelephonyConnectionService and
also via the connection manager's connection service. Because the ID
changes, we ended up adding these twice. Conferences weren't a problem in
the GSM conference case because the TElephonyConnectionService's
ConnectionServiceWrapper didn't know of the IDs for the children of the
conference. However, due to how the existing connections work its not the
case for VoLTE conferences. To mitigate this, I'm passing the original
connection/conference ID to the connection manager via extras (ugh) and
using this to ensure that when the new existing connection/conference is
added to telecom that the same ID is used. This ensures that we can
properly de-dupe the requests from TelephonyConnectionService and the
connection manager.
Also, there was some missing code in RemoteConnectionService which would
cause it to not properly track existing connections.
Bug:
31464792
Change-Id: I436f4438fd000ea48ebea7ceb75105bd3f456e46
Agnieszka Madurska [Mon, 6 Feb 2017 19:46:16 +0000 (19:46 +0000)]
Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev am:
16edc46ca3
am:
4633240f64
Change-Id: Icb14812f21c3d24dc728f2f2d47e98b917bf8b70
Aga Madurska [Mon, 6 Feb 2017 19:45:07 +0000 (19:45 +0000)]
Use correct APIs to detect conditions for round scrollbars. am:
99485ef841
am:
9e7a8688c1
Change-Id: I7538ff25e45ab6199370d529d5ea5db3171efbec
Agnieszka Madurska [Mon, 6 Feb 2017 19:42:01 +0000 (19:42 +0000)]
Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev am:
16edc46ca3
am:
a09e108f65
Change-Id: I664046e043150acbea9615a208a3d185f67d039f
Aga Madurska [Mon, 6 Feb 2017 19:40:50 +0000 (19:40 +0000)]
Use correct APIs to detect conditions for round scrollbars. am:
99485ef841
am:
50bc6a1998
Change-Id: Iab07814fd54b35705a20088e29c78a56ea943eba
Agnieszka Madurska [Mon, 6 Feb 2017 19:37:10 +0000 (19:37 +0000)]
Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev
am:
16edc46ca3
Change-Id: I9060baf17df88095df52f6f06ff1c678eb314e1f
Aga Madurska [Mon, 6 Feb 2017 19:37:04 +0000 (19:37 +0000)]
Use correct APIs to detect conditions for round scrollbars.
am:
99485ef841
Change-Id: I8aaa6bf17e253f6178b96c6743ff7779d5f3b7ef
Agnieszka Madurska [Mon, 6 Feb 2017 19:37:03 +0000 (19:37 +0000)]
Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev
am:
16edc46ca3
Change-Id: Idb27cb8e19376e11f7ec2e9366c50c8d382cf8ba
Aga Madurska [Mon, 6 Feb 2017 19:37:00 +0000 (19:37 +0000)]
Use correct APIs to detect conditions for round scrollbars.
am:
99485ef841
Change-Id: I8301a27b03d1ba64e48064057f112ebaf38eb6c2
Agnieszka Madurska [Mon, 6 Feb 2017 19:30:27 +0000 (19:30 +0000)]
Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev
Josh Gao [Mon, 6 Feb 2017 19:07:57 +0000 (19:07 +0000)]
Merge changes from topic 'debuggerd_ambient' am:
0784e51163 am:
ce0722f344
am:
646e4b3dc0
Change-Id: I14091fcf7be76b7383bbd1c8c1626d76c15220b1
Josh Gao [Mon, 6 Feb 2017 19:01:58 +0000 (19:01 +0000)]
Merge changes from topic 'debuggerd_ambient' am:
0784e51163
am:
ce0722f344
Change-Id: I16e66ebc770f0dbe0bcfea088648ad61e1818dd3
Josh Gao [Mon, 6 Feb 2017 19:00:02 +0000 (19:00 +0000)]
zygote: make all capabilities inheritable. am:
45dab78e98 am:
0f2a0b9908
am:
6f372daa9d
Change-Id: I1144d36ccaafa5d60249eaecbb8c5845c263a666
Josh Gao [Mon, 6 Feb 2017 18:59:15 +0000 (18:59 +0000)]
Revert "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am:
0a2d61505a am:
c75e4153cf
am:
dc3f66c3be
Change-Id: I31dbac8d9f738d198078a22a437cc9b272c46e4b
Josh Gao [Mon, 6 Feb 2017 18:53:04 +0000 (18:53 +0000)]
Merge changes from topic 'debuggerd_ambient'
am:
0784e51163
Change-Id: I842b682377d92f1b140fe442073d7b97d5090208
Josh Gao [Mon, 6 Feb 2017 18:52:20 +0000 (18:52 +0000)]
zygote: make all capabilities inheritable. am:
45dab78e98
am:
0f2a0b9908
Change-Id: I864b02533e461c332ad8c8e6c5b931a5dfa9485f
Josh Gao [Mon, 6 Feb 2017 18:51:21 +0000 (18:51 +0000)]
Revert "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am:
0a2d61505a
am:
c75e4153cf
Change-Id: Id936d8fde31c69ed04df81486f441244339a2065
Josh Gao [Mon, 6 Feb 2017 18:44:46 +0000 (18:44 +0000)]
zygote: make all capabilities inheritable.
am:
45dab78e98
Change-Id: I1983899a771bb82f644c75c0fe3e38342aab8402
Josh Gao [Mon, 6 Feb 2017 18:44:03 +0000 (18:44 +0000)]
Revert "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
am:
0a2d61505a
Change-Id: I38d9ec4b7be41b5ed7b3d9c30bce1c09315a5135
Josh Gao [Mon, 6 Feb 2017 18:37:54 +0000 (18:37 +0000)]
Merge changes from topic 'debuggerd_ambient'
* changes:
zygote: make all capabilities inheritable.
Revert "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
Paul Lawrence [Mon, 6 Feb 2017 18:16:38 +0000 (10:16 -0800)]
Expand whitelist
Bug:
35034743
Test: Builds, boots
Change-Id: I5ab77554d23a8498cf32953d447534742683deb8
Ying Wai (Daniel) Fan [Wed, 1 Feb 2017 06:00:10 +0000 (22:00 -0800)]
Prevent division-by-zero error when calculating battery capacity.
Bug:
34255953
Change-Id: Ie072cd5dc26faf17e8ab46ea0795750396f087c2
Fixes:
34255953
Test: formula change CL. No existing unit tests found.
Android Build Merger (Role) [Mon, 6 Feb 2017 17:55:02 +0000 (17:55 +0000)]
Merge "Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am:
504ca8e41a am:
1f8f29968b am:
57f2ed0757" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Mon, 6 Feb 2017 17:54:24 +0000 (17:54 +0000)]
Merge "Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am:
504ca8e41a am:
1f8f29968b am:
43c6f28891" into nyc-mr2-dev-plus-aosp
Pavel Grafov [Mon, 6 Feb 2017 17:53:56 +0000 (17:53 +0000)]
Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am:
504ca8e41a am:
1f8f29968b
am:
57f2ed0757
Change-Id: I0e4c4509da48a7ab4cd3e66e942a55c81d489613
Pavel Grafov [Mon, 6 Feb 2017 17:53:42 +0000 (17:53 +0000)]
Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am:
504ca8e41a am:
1f8f29968b
am:
43c6f28891
Change-Id: I862bf8bfb188bb2951d5c01254239d42ef92e1c2
Android Build Merger (Role) [Mon, 6 Feb 2017 17:53:29 +0000 (17:53 +0000)]
Merge "Fix the documentation for SecurityLog.SecurityEvent.getData(). am:
739cda8f31 am:
fca679ff74 am:
1bb00e0849" into nyc-mr2-dev-plus-aosp
Pavel Grafov [Mon, 6 Feb 2017 17:52:43 +0000 (17:52 +0000)]
Fix the documentation for SecurityLog.SecurityEvent.getData(). am:
739cda8f31 am:
fca679ff74
am:
1bb00e0849
Change-Id: Ice787dfa05849e8a2b77575969334c33509cacb7
Pavel Grafov [Mon, 6 Feb 2017 17:52:37 +0000 (17:52 +0000)]
Fix the documentation for SecurityLog.SecurityEvent.getData(). am:
739cda8f31 am:
fca679ff74
am:
5a474b4930
Change-Id: If1731db386157b1f53c3a7bbe379299c1ada0ca9
Pavel Grafov [Mon, 6 Feb 2017 17:47:17 +0000 (17:47 +0000)]
Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am:
504ca8e41a
am:
1f8f29968b
Change-Id: Id0a5c05b902f6c47c32dbef4d84cbe527a8803b9
Pavel Grafov [Mon, 6 Feb 2017 17:47:10 +0000 (17:47 +0000)]
Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am:
504ca8e41a
am:
1f8f29968b
Change-Id: Ib43072f8a6d35c4e297493f49386aafed53a609a
Pavel Grafov [Mon, 6 Feb 2017 17:46:11 +0000 (17:46 +0000)]
Fix the documentation for SecurityLog.SecurityEvent.getData(). am:
739cda8f31
am:
fca679ff74
Change-Id: Ic6e2aab590583c501fa74317ee614ab1ebaea378
Pavel Grafov [Mon, 6 Feb 2017 17:46:09 +0000 (17:46 +0000)]
Fix the documentation for SecurityLog.SecurityEvent.getData(). am:
739cda8f31
am:
fca679ff74
Change-Id: I9f02c30450e56b8f25bbbe4b1baa2381c84437c8
Pavel Grafov [Mon, 6 Feb 2017 17:41:12 +0000 (17:41 +0000)]
Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev
am:
504ca8e41a
Change-Id: I9f880a65827d689aa379ff54138f54422048a59c
Pavel Grafov [Mon, 6 Feb 2017 17:41:08 +0000 (17:41 +0000)]
Fix the documentation for SecurityLog.SecurityEvent.getData().
am:
739cda8f31
Change-Id: I0c6f1271392bfc9cc8d253d5fa5e029213492b48
Pavel Grafov [Mon, 6 Feb 2017 17:35:04 +0000 (17:35 +0000)]
Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev
Tyler Gunn [Tue, 31 Jan 2017 18:49:05 +0000 (10:49 -0800)]
Self managed CS implementation.
Add required AIDL changes to pass along connection fails.
Test: Manual
Bug:
34159263
Merged-In: I0a24ff786b2867aa4e19ac79959df54a04983251
Change-Id: I0a24ff786b2867aa4e19ac79959df54a04983251
Jason Monk [Mon, 6 Feb 2017 15:52:04 +0000 (15:52 +0000)]
Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" am:
ff1d8da55e am:
74a8b6543f
am:
a8e10e5f20
Change-Id: I1585be50ecf4409f552b5ef5c91de1092a01e199
Jason Monk [Mon, 6 Feb 2017 15:47:39 +0000 (15:47 +0000)]
Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" am:
ff1d8da55e
am:
74a8b6543f
Change-Id: If195ccf536a45ef21e8ee70547ea76e26732c583
Jason Monk [Mon, 6 Feb 2017 15:43:04 +0000 (15:43 +0000)]
Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent"
am:
ff1d8da55e
Change-Id: I173b94730ae02f3e9b0638aac9f43972b59e10f3
Jason Monk [Mon, 6 Feb 2017 15:34:37 +0000 (15:34 +0000)]
Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent"
Narayan Kamath [Mon, 6 Feb 2017 14:25:35 +0000 (14:25 +0000)]
Merge "MethodHandles: Expose additional API." am:
869141fef7 am:
a93d04a765
am:
f29140955f
Change-Id: I3e909e1a4faf70fcc9a58fc7bcd6c25abc87d901
Narayan Kamath [Mon, 6 Feb 2017 14:21:07 +0000 (14:21 +0000)]
Merge "MethodHandles: Expose additional API." am:
869141fef7
am:
a93d04a765
Change-Id: I7eef5b76fadc6303ae37b95fb855b16d2411bdb9
Narayan Kamath [Mon, 6 Feb 2017 14:15:48 +0000 (14:15 +0000)]
Merge "MethodHandles: Expose additional API."
am:
869141fef7
Change-Id: I73b9867bc1973dd4661470cebb0d9086666593aa
Narayan Kamath [Mon, 6 Feb 2017 14:09:45 +0000 (14:09 +0000)]
Merge "MethodHandles: Expose additional API."
Aga Madurska [Tue, 31 Jan 2017 13:24:02 +0000 (13:24 +0000)]
Use correct APIs to detect conditions for round scrollbars.
Bug:
34876394
Test: Performed manually.
Change-Id: I9e690e99fd8d925c589ebd19d9c6754eeb63b1d8
Orion Hodson [Mon, 6 Feb 2017 10:43:22 +0000 (10:43 +0000)]
Merge "Add bytecodes for invoke-polymorphic" am:
ef59955f58 am:
dcaa9fd642
am:
4fc15223c2
Change-Id: I022d1917400ea9e694cc58743ca345ac58fe0379
Orion Hodson [Mon, 6 Feb 2017 10:37:24 +0000 (10:37 +0000)]
Merge "Add bytecodes for invoke-polymorphic" am:
ef59955f58
am:
dcaa9fd642
Change-Id: I4dba3f073900fa47cb1c4fa8ec36fb8f547fd982
Orion Hodson [Mon, 6 Feb 2017 10:30:40 +0000 (10:30 +0000)]
Merge "Add bytecodes for invoke-polymorphic"
am:
ef59955f58
Change-Id: If95860a3680dc8857b54a864917d5074eba57c9a
Orion Hodson [Mon, 6 Feb 2017 10:21:53 +0000 (10:21 +0000)]
Merge "Add bytecodes for invoke-polymorphic"
Akira Oshimi [Tue, 24 Jan 2017 07:50:53 +0000 (16:50 +0900)]
Add tile information to ACTION_QS_TILE_PREFERENCES intent
One application can provide two or more custom Quick Settings tiles.
But there is no way to know which tile is long-pressed from application
side because ACTION_QS_TILE_PREFERENCES intent that is sent when
long-pressed doesn't have any additional information. So the component
name and state of the tile should be added to the intent.
Bug:
34832801
Test: manual - long press a custom tile
Change-Id: Iaa884cd944f19a2f007cbde645e8f8b1198bffb7
Ricardo Loo [Sat, 4 Feb 2017 00:38:01 +0000 (18:38 -0600)]
docs: Update gluUnProject parameter description.
Adding missing variable in the output vector.
Originally reported in
http://code.google.com/p/android/issues/detail?id=25143
Change-Id: I91d9ce7e53a9d9cdd890899a0edd49830d533b9b
Bug:
5991013
Chris Craik [Fri, 3 Feb 2017 22:03:53 +0000 (22:03 +0000)]
Merge "Add ShadowShaderAnimation benchmark DO NOT MERGE" am:
6678d34133 -s ours am:
6385d23f43 -s ours
am:
7a0720e22c
Change-Id: Idc55c41fdbad5ef6a81d753d2acad34b81137586
Paul Lawrence [Fri, 3 Feb 2017 21:58:03 +0000 (21:58 +0000)]
Merge "Expand whitelist" am:
fe88a5e81d am:
f907b0fcc7
am:
edc3f365a0
Change-Id: I51bc6c7b90c2e93942c62c0eb49c13b19581a0d9
OSDN Git Service
