OSDN Git Service

android-x86/frameworks-base.git
7 years agoFix requiresCharging false value ignored issue
Shreyas Basarge [Wed, 8 Feb 2017 00:58:47 +0000 (00:58 +0000)]
Fix requiresCharging false value ignored issue
am: e33c3c81af

Change-Id: Ia96915b00e274ed6c7c8fdaea46ee5a0ba83bdcb

7 years agoMerge "2D Recents: Fix the thumbnail radius." into nyc-mr2-dev
Jiaquan He [Wed, 8 Feb 2017 00:06:29 +0000 (00:06 +0000)]
Merge "2D Recents: Fix the thumbnail radius." into nyc-mr2-dev
am: 85016506c6

Change-Id: Id0a029ed2120e7c040332a0e6fb46b05c5c4b947

7 years ago2D Recents: Fix the thumbnail radius.
Jiaquan He [Wed, 8 Feb 2017 00:06:22 +0000 (00:06 +0000)]
2D Recents: Fix the thumbnail radius.
am: 083c6fbbd0

Change-Id: I93ff98979bcffa0c3724807ec9caac8f39025fa6

7 years agoMerge "2D Recents: Fix the thumbnail radius." into nyc-mr2-dev
TreeHugger Robot [Wed, 8 Feb 2017 00:00:22 +0000 (00:00 +0000)]
Merge "2D Recents: Fix the thumbnail radius." into nyc-mr2-dev

7 years agoMerge changes from topic 'Passpoint API Rename' am: 93d66c83cf am: 322c9a9ec5
Peter Qiu [Tue, 7 Feb 2017 23:54:40 +0000 (23:54 +0000)]
Merge changes from topic 'Passpoint API Rename' am: 93d66c83cf am: 322c9a9ec5
am: 1c8845c6b0

Change-Id: Id22714a3ab72ce5a0b5e1dcd294a7ef7db33da57

7 years agohotspot2: expose Passpoint APIs as public am: bffe405e1f am: b898025e8c
Peter Qiu [Tue, 7 Feb 2017 23:49:35 +0000 (23:49 +0000)]
hotspot2: expose Passpoint APIs as public am: bffe405e1f am: b898025e8c
am: 1a8cb5dfec

Change-Id: I75201e7f464e7228458b62d9f79565097b602752

7 years agohotspot2: fix class/function/variable names to comply with API guideline am: da8a67e8...
Peter Qiu [Tue, 7 Feb 2017 23:48:42 +0000 (23:48 +0000)]
hotspot2: fix class/function/variable names to comply with API guideline am: da8a67e8a6 am: 7fec249699
am: 57375308dc

Change-Id: I897cd2c051d7c4b3b5165114d975f5e7398f4556

7 years agoMerge changes from topic 'Passpoint API Rename' am: 93d66c83cf
Peter Qiu [Tue, 7 Feb 2017 23:47:46 +0000 (23:47 +0000)]
Merge changes from topic 'Passpoint API Rename' am: 93d66c83cf
am: 322c9a9ec5

Change-Id: I91231f6c6ad804997071f81f0d3998f1d8231a73

7 years agohotspot2: rename classes to comply with API guideline am: a77809766c am: c4f4a1ac9e
Peter Qiu [Tue, 7 Feb 2017 23:47:32 +0000 (23:47 +0000)]
hotspot2: rename classes to comply with API guideline am: a77809766c am: c4f4a1ac9e
am: 9bddb8ccd8

Change-Id: I78d0edc46b89683832f26061f97f3ebebe245f93

7 years agohotspot2: expose Passpoint APIs as public am: bffe405e1f
Peter Qiu [Tue, 7 Feb 2017 23:40:45 +0000 (23:40 +0000)]
hotspot2: expose Passpoint APIs as public am: bffe405e1f
am: b898025e8c

Change-Id: I10d77f87722d5b21004df1394b1b5d9e82b78976

7 years agohotspot2: fix class/function/variable names to comply with API guideline am: da8a67e8a6
Peter Qiu [Tue, 7 Feb 2017 23:39:50 +0000 (23:39 +0000)]
hotspot2: fix class/function/variable names to comply with API guideline am: da8a67e8a6
am: 7fec249699

Change-Id: Ib37832f30b5174f52e71ef2e3f796c669ba7bda9

7 years agohotspot2: rename classes to comply with API guideline am: a77809766c
Peter Qiu [Tue, 7 Feb 2017 23:38:36 +0000 (23:38 +0000)]
hotspot2: rename classes to comply with API guideline am: a77809766c
am: c4f4a1ac9e

Change-Id: I00cda97fa573cb7dcb3ac8501ead6b34b91f1b1e

7 years agoMerge changes from topic 'Passpoint API Rename'
Peter Qiu [Tue, 7 Feb 2017 23:38:35 +0000 (23:38 +0000)]
Merge changes from topic 'Passpoint API Rename'
am: 93d66c83cf

Change-Id: Ibff6d79c8ca51b760932909e89b21e8c843acc89

7 years agohotspot2: expose Passpoint APIs as public
Peter Qiu [Tue, 7 Feb 2017 23:32:08 +0000 (23:32 +0000)]
hotspot2: expose Passpoint APIs as public
am: bffe405e1f

Change-Id: I86065439f5902b6ce7b0ceec3f295e14f0dff47f

7 years agohotspot2: fix class/function/variable names to comply with API guideline
Peter Qiu [Tue, 7 Feb 2017 23:31:02 +0000 (23:31 +0000)]
hotspot2: fix class/function/variable names to comply with API guideline
am: da8a67e8a6

Change-Id: I48f7b3ab747c0323aec5208c7a0afa123ff68729

7 years agohotspot2: rename classes to comply with API guideline
Peter Qiu [Tue, 7 Feb 2017 23:30:19 +0000 (23:30 +0000)]
hotspot2: rename classes to comply with API guideline
am: a77809766c

Change-Id: Iaaf34a5ec744775e472d1b3eb8673ebf610b1c61

7 years agoMerge changes from topic 'Passpoint API Rename'
Treehugger Robot [Tue, 7 Feb 2017 23:25:02 +0000 (23:25 +0000)]
Merge changes from topic 'Passpoint API Rename'

* changes:
  hotspot2: expose Passpoint APIs as public
  hotspot2: fix class/function/variable names to comply with API guideline
  hotspot2: rename classes to comply with API guideline

7 years agoMerge "Expand seccomp whitelist" am: 10e7aed13f am: 0ab0d47516
Paul Lawrence [Tue, 7 Feb 2017 23:08:00 +0000 (23:08 +0000)]
Merge "Expand seccomp whitelist" am: 10e7aed13f am: 0ab0d47516
am: 53e6c94c0b

Change-Id: I4f6e9e4c705505861c7b61dcc2c36f3d997a402d

7 years agoMerge "Expand seccomp whitelist" am: 10e7aed13f
Paul Lawrence [Tue, 7 Feb 2017 23:03:32 +0000 (23:03 +0000)]
Merge "Expand seccomp whitelist" am: 10e7aed13f
am: 0ab0d47516

Change-Id: Id7512df1f0df56f73352c82a3ad55eb5360ebd91

7 years agoMerge "Expand seccomp whitelist"
Paul Lawrence [Tue, 7 Feb 2017 22:59:34 +0000 (22:59 +0000)]
Merge "Expand seccomp whitelist"
am: 10e7aed13f

Change-Id: I8060b31a8ac20ddd77b7139c5a3bbd8d146dbc27

7 years agoMerge "Expand seccomp whitelist"
Paul Lawrence [Tue, 7 Feb 2017 22:50:43 +0000 (22:50 +0000)]
Merge "Expand seccomp whitelist"

7 years agoMerge "Perform camera permission and app ops check when setting camera for VT." am...
Brad Ebinger [Tue, 7 Feb 2017 22:41:58 +0000 (22:41 +0000)]
Merge "Perform camera permission and app ops check when setting camera for VT." am: ed5c217fc0 am: 3d6f878b75
am: ac3f482f15

Change-Id: I773c607ea2999e6d32c7fcc578cf7b3c86510521

7 years agoMerge "Perform camera permission and app ops check when setting camera for VT." am...
Brad Ebinger [Tue, 7 Feb 2017 22:37:31 +0000 (22:37 +0000)]
Merge "Perform camera permission and app ops check when setting camera for VT." am: ed5c217fc0
am: 3d6f878b75

Change-Id: I0ed577718d9ffd72ec7668889d4da4db0060cb5f

7 years agoMerge "Perform camera permission and app ops check when setting camera for VT."
Brad Ebinger [Tue, 7 Feb 2017 22:33:05 +0000 (22:33 +0000)]
Merge "Perform camera permission and app ops check when setting camera for VT."
am: ed5c217fc0

Change-Id: I0fd4ed2260a9654e2889121022192f62f86a3d0c

7 years agoMerge "Perform camera permission and app ops check when setting camera for VT."
Brad Ebinger [Tue, 7 Feb 2017 22:26:43 +0000 (22:26 +0000)]
Merge "Perform camera permission and app ops check when setting camera for VT."

7 years agohotspot2: expose Passpoint APIs as public
Peter Qiu [Wed, 1 Feb 2017 04:08:38 +0000 (20:08 -0800)]
hotspot2: expose Passpoint APIs as public

Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I8bf5c715b9088c673e59a73a78e18f6e6b64d1d1

7 years agohotspot2: fix class/function/variable names to comply with API guideline
Peter Qiu [Thu, 2 Feb 2017 18:25:05 +0000 (10:25 -0800)]
hotspot2: fix class/function/variable names to comply with API guideline

Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworsk/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ide425c06be46bc41c8f601e732dca0543de096b1

7 years agohotspot2: rename classes to comply with API guideline
Peter Qiu [Thu, 2 Feb 2017 18:22:16 +0000 (10:22 -0800)]
hotspot2: rename classes to comply with API guideline

This is purely a file rename operation.

Bug: 34862444
Test: None
Change-Id: I297a228f3ee7e09c9cce5ca9f677eb1db478fd46

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Tue, 7 Feb 2017 17:28:13 +0000 (17:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 7e61e7c585  -s ours

Change-Id: I541c140a9244f7671b3a09f19a4e0ff7acef4f0f

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 7 Feb 2017 17:28:07 +0000 (17:28 +0000)]
Import translations. DO NOT MERGE
am: ca2ead63c9  -s ours

Change-Id: I0411d2408480cd60d32c40db1e5c5f59a9d98609

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 7 Feb 2017 17:21:06 +0000 (17:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoExpand seccomp whitelist
Paul Lawrence [Tue, 7 Feb 2017 16:18:03 +0000 (08:18 -0800)]
Expand seccomp whitelist

Bug: 34979910
Test: System boots, app runs
Change-Id: I8b60a24ac855679251e73edcdec57eb4af4a5610

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Tue, 7 Feb 2017 04:39:57 +0000 (04:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 6654edae49  -s ours

Change-Id: If56de402cfaf73f7ac75e1253b79345e58bc1710

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 7 Feb 2017 04:39:53 +0000 (04:39 +0000)]
Import translations. DO NOT MERGE
am: 446a66d235  -s ours

Change-Id: I9297388b7b115d9da3083c388aeb25341acd7560

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 7 Feb 2017 04:30:04 +0000 (04:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Tue, 7 Feb 2017 04:27:54 +0000 (04:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: f3f4f78dc7  -s ours

Change-Id: Ifda84719fb488b46456723973b76ce59caef0aa6

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 7 Feb 2017 04:27:50 +0000 (04:27 +0000)]
Import translations. DO NOT MERGE
am: b83f6b6f44  -s ours

Change-Id: I7e228f66a17fbdede843865827fc91f4c6790509

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 7 Feb 2017 04:21:41 +0000 (04:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Fingerprint: get auth id for non-current user." into nyc-mr2-dev
Charles He [Tue, 7 Feb 2017 01:20:49 +0000 (01:20 +0000)]
Merge "Fingerprint: get auth id for non-current user." into nyc-mr2-dev
am: 15b8313d1b

Change-Id: I2d2eca47ab2eb548e48dad733a7956be83511252

7 years agoFingerprint: get auth id for non-current user.
Charles He [Tue, 7 Feb 2017 01:20:42 +0000 (01:20 +0000)]
Fingerprint: get auth id for non-current user.
am: aae60473e1

Change-Id: I547076caaa27d86d682addc14106a344a1b4cec9

7 years agoMerge "Fingerprint: get auth id for non-current user." into nyc-mr2-dev
Charles He [Tue, 7 Feb 2017 01:15:20 +0000 (01:15 +0000)]
Merge "Fingerprint: get auth id for non-current user." into nyc-mr2-dev

7 years agoFingerprint: get auth id for non-current user.
Charles He [Fri, 27 Jan 2017 16:14:52 +0000 (16:14 +0000)]
Fingerprint: get auth id for non-current user.

Previously, getAuthenticatorId() simply returns the authenticator id
corresponding to the currently active user in FingerprintService.
However, this can cause bugs when, for example, KeyStore calls the
method before storing a fingerprint-bound key for a non-current user. In
such cases, the authenticator id of the calling user is desired, which
is not necessarily the same as the "current user" in FingerprintService.
This CL ensures the FingerprintService always returns the authenticator
id of the calling user.

Bug: 33459191
Test: manual
Change-Id: Ia9d6b869d16bd37f45358ba839cd12901ebc1076
Merged-In: I35c5a3a7082cffb8941eeaa219c8e20948ad41a9

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 7 Feb 2017 00:42:58 +0000 (16:42 -0800)]
Import translations. DO NOT MERGE

Change-Id: Id83eff0bcff1cfadadc4e91ce2d9d58a3f31194e
Auto-generated-cl: translation import

7 years agoMerge "Fixes Treble marshaling of strings embedded in structures from Java" am: 97fca...
Andreas Huber [Tue, 7 Feb 2017 00:20:19 +0000 (00:20 +0000)]
Merge "Fixes Treble marshaling of strings embedded in structures from Java" am: 97fca8c035 am: 0bae9b1406
am: 0e686542e6

Change-Id: I145b206fc2af5dee4271b94640476507a49f7dbd

7 years agoMerge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62...
Pavlin Radoslavov [Tue, 7 Feb 2017 00:18:40 +0000 (00:18 +0000)]
Merge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62 am: cd6e0ee19d
am: b7067e2b6c

Change-Id: I459480c5bf8e512340d95452c491e9e2986a84a8

7 years agoMerge "Hotspot Tile: longclick should open Tethering settings" am: 96c4f1a21e am...
Jason Monk [Tue, 7 Feb 2017 00:17:43 +0000 (00:17 +0000)]
Merge "Hotspot Tile: longclick should open Tethering settings" am: 96c4f1a21e am: 4e82bf6c51
am: 55345f5c30

Change-Id: I7874cfc1e034577390d5d77ebbdb22358de57b47

7 years agoMerge "Remove uncessary dependency of libhwui" am: df36be5f17 am: eebd7d7970
Miao Wang [Tue, 7 Feb 2017 00:12:49 +0000 (00:12 +0000)]
Merge "Remove uncessary dependency of libhwui" am: df36be5f17 am: eebd7d7970
am: 558e5dac4d

Change-Id: I99b2fded709c63c71fd9d9f02020a986e3025fa6

7 years agoMerge "Fixes Treble marshaling of strings embedded in structures from Java" am: 97fca...
Andreas Huber [Tue, 7 Feb 2017 00:12:13 +0000 (00:12 +0000)]
Merge "Fixes Treble marshaling of strings embedded in structures from Java" am: 97fca8c035
am: 0bae9b1406

Change-Id: I0eb29e3e80243a958aa2520924ea9ad859034cdf

7 years agoMerge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62
Pavlin Radoslavov [Tue, 7 Feb 2017 00:10:21 +0000 (00:10 +0000)]
Merge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62
am: cd6e0ee19d

Change-Id: I6fb8a3a35451cf2d1e228466ef4a4d4e89d1d4ca

7 years agoMerge "Hotspot Tile: longclick should open Tethering settings" am: 96c4f1a21e
Jason Monk [Tue, 7 Feb 2017 00:09:14 +0000 (00:09 +0000)]
Merge "Hotspot Tile: longclick should open Tethering settings" am: 96c4f1a21e
am: 4e82bf6c51

Change-Id: I39d311e1b455a7a3e53ac8c1b12d1d67b07972ee

7 years agoMerge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am: 84f97e21b2...
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

7 years agoMerge "Remove uncessary dependency of libhwui" am: df36be5f17
Miao Wang [Tue, 7 Feb 2017 00:08:05 +0000 (00:08 +0000)]
Merge "Remove uncessary dependency of libhwui" am: df36be5f17
am: eebd7d7970

Change-Id: I3e7b282340259eaad71569e8a15f5028852852ee

7 years agoMerge "Self managed CS implementation." am: d736a6b2c2 am: 6bd991b3d2
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

7 years agoMerge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am: 84f97e21b2
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

7 years agoMerge "Self managed CS implementation." am: d736a6b2c2
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

7 years agoMerge "Fixes Treble marshaling of strings embedded in structures from Java"
Andreas Huber [Mon, 6 Feb 2017 23:45:53 +0000 (23:45 +0000)]
Merge "Fixes Treble marshaling of strings embedded in structures from Java"
am: 97fca8c035

Change-Id: Iac2492ccc736b83d6ae46022b643fd229c2c307e

7 years agoMerge "Fixes Treble marshaling of strings embedded in structures from Java"
Treehugger Robot [Mon, 6 Feb 2017 23:41:27 +0000 (23:41 +0000)]
Merge "Fixes Treble marshaling of strings embedded in structures from Java"

7 years agoMerge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev
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

7 years agoRemove experimental twilight-based automatic brightness
Justin Klaassen [Mon, 6 Feb 2017 23:28:27 +0000 (23:28 +0000)]
Remove experimental twilight-based automatic brightness
am: 614f40ea01

Change-Id: I1b0ec1645f38892adb894900b3b3725fc0b23452

7 years agoMerge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev
TreeHugger Robot [Mon, 6 Feb 2017 23:21:01 +0000 (23:21 +0000)]
Merge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev

7 years agoMerge "Add a mechanism to configure the default A2DP codec priorities"
Pavlin Radoslavov [Mon, 6 Feb 2017 23:12:23 +0000 (23:12 +0000)]
Merge "Add a mechanism to configure the default A2DP codec priorities"
am: acf34d8b62

Change-Id: I8a97b344bb09f4bded076ea81875b3b78dc50bea

7 years agoMerge "Prevent division-by-zero error when calculating battery capacity." into cw...
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

7 years agoPrevent division-by-zero error when calculating battery capacity. am: 415f8b32e8
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

7 years agoMerge "Hotspot Tile: longclick should open Tethering settings"
Jason Monk [Mon, 6 Feb 2017 23:03:24 +0000 (23:03 +0000)]
Merge "Hotspot Tile: longclick should open Tethering settings"
am: 96c4f1a21e

Change-Id: I42b701c8d390333f6d121bea2ee6c3284e646e9c

7 years agoMerge "Prevent division-by-zero error when calculating battery capacity." into cw...
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

7 years agoPrevent division-by-zero error when calculating battery capacity. am: 415f8b32e8
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

7 years agoMerge "Prevent division-by-zero error when calculating battery capacity." into cw...
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

7 years agoPrevent division-by-zero error when calculating battery capacity.
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

7 years agoMerge "Add a mechanism to configure the default A2DP codec priorities"
Treehugger Robot [Mon, 6 Feb 2017 22:59:50 +0000 (22:59 +0000)]
Merge "Add a mechanism to configure the default A2DP codec priorities"

7 years agoMerge "Prevent division-by-zero error when calculating battery capacity." into cw...
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

7 years agoPrevent division-by-zero error when calculating battery capacity.
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

7 years agoMerge "Remove uncessary dependency of libhwui"
Miao Wang [Mon, 6 Feb 2017 22:56:58 +0000 (22:56 +0000)]
Merge "Remove uncessary dependency of libhwui"
am: df36be5f17

Change-Id: I5ccce1f195a43ff00b9bd7fc350d7ae915c566d7

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 6 Feb 2017 22:55:04 +0000 (14:55 -0800)]
Import translations. DO NOT MERGE

Change-Id: If399bc861f4e82ce0e7e285927ff1cd90b15ced1
Auto-generated-cl: translation import

7 years agoMerge "Hotspot Tile: longclick should open Tethering settings"
Jason Monk [Mon, 6 Feb 2017 22:53:58 +0000 (22:53 +0000)]
Merge "Hotspot Tile: longclick should open Tethering settings"

7 years agoMerge "Prevent division-by-zero error when calculating battery capacity." into cw...
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

7 years agoPerform camera permission and app ops check when setting camera for VT.
Tyler Gunn [Wed, 9 Nov 2016 18:19:23 +0000 (10:19 -0800)]
Perform camera permission and app ops check when setting camera for VT.

When a calling InCallService attempts to use the setCamera API on the
VideoCall, Telecom will perform a permission check to ensure that the
caller has the correct camera permission and passes the app-ops camera
check.  A failure to set the camera will result in a callback via the
call session event API.

This got a little messy as the app ops package name needs to come from the
InCallService, and handler usage in the VideoProvider API means we had to
pass around the uid/pid of the caller, obtained before we trampoline onto
the handler.

Test: Unit tests added, manual testing performed.
Bug: 32747443
Change-Id: I555a04f9c3fb45e60bb811f64ba855ccf2e3b0e2

7 years agoMerge "2D Recents: use correct layout logic for drawing transition headers" into...
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

7 years ago2D Recents: use correct layout logic for drawing transition headers
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

7 years agoMerge "Remove uncessary dependency of libhwui"
Miao Wang [Mon, 6 Feb 2017 22:47:15 +0000 (22:47 +0000)]
Merge "Remove uncessary dependency of libhwui"

7 years agoMerge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged"
Jack Yu [Mon, 6 Feb 2017 22:47:05 +0000 (22:47 +0000)]
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged"
am: 84f97e21b2

Change-Id: Ib35393c60b0800d21507bd5d8ffe35345e6e6926

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 6 Feb 2017 22:45:47 +0000 (14:45 -0800)]
Import translations. DO NOT MERGE

Change-Id: I49242a808f0bf41ff7229c82e198bfb05ea87a2e
Auto-generated-cl: translation import

7 years agoMerge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged"
Treehugger Robot [Mon, 6 Feb 2017 22:41:10 +0000 (22:41 +0000)]
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged"

7 years agoMerge "Self managed CS implementation."
Tyler Gunn [Mon, 6 Feb 2017 22:40:39 +0000 (22:40 +0000)]
Merge "Self managed CS implementation."
am: d736a6b2c2

Change-Id: I9c1a84cade87a208f2e509fb0f32457c64014147

7 years agoMerge "2D Recents: use correct layout logic for drawing transition headers" into...
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

7 years agoMerge "Self managed CS implementation."
Tyler Gunn [Mon, 6 Feb 2017 22:32:13 +0000 (22:32 +0000)]
Merge "Self managed CS implementation."

7 years agoMerge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices....
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

7 years agoMerge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices....
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

7 years agoMerge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices."
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

7 years agoRenamed voiceNetworkStateChanged and dataNetworkStateChanged
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

7 years agoMerge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices."
Brad Ebinger [Mon, 6 Feb 2017 22:03:29 +0000 (22:03 +0000)]
Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices."

7 years agoAdd a mechanism to configure the default A2DP codec priorities
Pavlin Radoslavov [Sun, 5 Feb 2017 23:45:06 +0000 (15:45 -0800)]
Add a mechanism to configure the default A2DP codec priorities

Previously, the relative codec priorities were hard-codec internally.
The new mechanism uses the following configurable resources in
packages/apps/Bluetooth/res/values/config.xml to re-assign the
default codec priorities per device, or to explicitly disable a codec.

 - a2dp_source_codec_priority_sbc
 - a2dp_source_codec_priority_aac
 - a2dp_source_codec_priority_aptx
 - a2dp_source_codec_priority_aptx_hd
 - a2dp_source_codec_priority_ldac

Those values are assigned on startup.
Also, they can be changed per device by using an overlay:
device/<VENDOR>/<DEVICE>/overlay/packages/apps/Bluetooth/res/values/config.xml

Test: Manually streaming to a headset
Change-Id: Ic4da3a51ac73f00cbae731156cb7878c8fadee06

7 years agoMerge "Expand whitelist" am: 006065fee4 am: bff26f4bf1
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

7 years agoMerge "Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev...
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

7 years agoMerge "Expand whitelist" am: 006065fee4
Paul Lawrence [Mon, 6 Feb 2017 20:57:23 +0000 (20:57 +0000)]
Merge "Expand whitelist" am: 006065fee4
am: bff26f4bf1

Change-Id: I2ad973c64c858b11628348965e9593f9f85c6dbe

7 years agoMerge "Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev...
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

7 years agoMerge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am: 19dae58...
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

7 years agoMerge "docs: Update gluUnProject parameter description. am: 232c4900ac am: cb6a5fc0f3...
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

7 years agoMerge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am: 19dae58...
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

7 years agodocs: Update gluUnProject parameter description. am: 232c4900ac am: cb6a5fc0f3
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

7 years agodocs: Update gluUnProject parameter description. am: 232c4900ac am: cb6a5fc0f3
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