git.osdn.net Git - android-x86/frameworks-base.git/log

Chet Haase [Mon, 19 Jun 2017 23:47:17 +0000 (23:47 +0000)]

Merge "Make --no-window-animation flag apply to animators, too" into oc-dev am: c36e3e7fff
am: 972734f592

Change-Id: I02666e4918b849cf4bcc119a61b4b693825dabe2

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Jun 2017 23:43:42 +0000 (23:43 +0000)]

Merge "Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev am: 113918f309 am: 22765d383a" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Wale Ogunwale [Mon, 19 Jun 2017 23:41:36 +0000 (23:41 +0000)]

Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev am: 113918f309
am: 22765d383a

Change-Id: I78669da1158fca8ca7276aeb0a09715d4452d737

commit | commitdiff | tree

Chet Haase [Mon, 19 Jun 2017 23:39:58 +0000 (23:39 +0000)]

Merge "Make --no-window-animation flag apply to animators, too" into oc-dev
am: c36e3e7fff

Change-Id: Ic680329647398f52a0d28633aa209e37556c1e31

commit | commitdiff | tree

Wale Ogunwale [Mon, 19 Jun 2017 23:39:48 +0000 (23:39 +0000)]

Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev am: 113918f309
am: f4dc128aa2

Change-Id: I52603e6bff98472c5dc6e6e5308d6beb76e7780e

commit | commitdiff | tree

Wale Ogunwale [Mon, 19 Jun 2017 23:29:53 +0000 (23:29 +0000)]

Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev
am: 113918f309

Change-Id: Iab45bb64e04cbddde6cd627763aab19b663aa919

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 23:29:04 +0000 (23:29 +0000)]

Merge "Make --no-window-animation flag apply to animators, too" into oc-dev

commit | commitdiff | tree

Wale Ogunwale [Mon, 19 Jun 2017 23:27:57 +0000 (23:27 +0000)]

Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev
am: 113918f309

Change-Id: I655721c29b22da375742628a9e7b8b3075b2dd27

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 23:16:14 +0000 (23:16 +0000)]

Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev

commit | commitdiff | tree

Fan Zhang [Mon, 19 Jun 2017 22:39:35 +0000 (22:39 +0000)]

Merge "Add logging constant for wifi tether setting page." into oc-dr1-dev
am: 610e7400d7

Change-Id: I23b56c2abf0108fbc197777eb209ec6eb29c5fce

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 22:27:47 +0000 (22:27 +0000)]

Merge "Add logging constant for wifi tether setting page." into oc-dr1-dev

commit | commitdiff | tree

Andreas Huber [Mon, 19 Jun 2017 22:26:46 +0000 (22:26 +0000)]

Merge "Add an extra level of indirection to make sure that native IHwBinder" am: b6dde12ef0 am: e7191f50b5
am: 0cf0b39360

Change-Id: Id47548cd4209bd7d4d0ede478fd5372d31c22a36

commit | commitdiff | tree

Andreas Huber [Mon, 19 Jun 2017 22:19:55 +0000 (22:19 +0000)]

Merge "Add an extra level of indirection to make sure that native IHwBinder" am: b6dde12ef0
am: e7191f50b5

Change-Id: If9c376697a638523f6b691fa37d9cfb73fc8e20d

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Jun 2017 22:16:35 +0000 (22:16 +0000)]

Merge "Merge "[Companion] Fix NPE in associate" into oc-dev am: ba003a97f8 am: 5cb26b76ff" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Eugene Susla [Mon, 19 Jun 2017 22:13:51 +0000 (22:13 +0000)]

Merge "[Companion] Fix NPE in associate" into oc-dev am: ba003a97f8
am: 5cb26b76ff

Change-Id: Ie3c2e7154357a51b4947c807347650456297d81d

commit | commitdiff | tree

Eugene Susla [Mon, 19 Jun 2017 22:13:44 +0000 (22:13 +0000)]

Merge "[Companion] Fix NPE in associate" into oc-dev am: ba003a97f8
am: c675cf85a7

Change-Id: Id86e6703dfc57705b361adf66da9f852498b32ea

commit | commitdiff | tree

Andreas Huber [Mon, 19 Jun 2017 22:07:45 +0000 (22:07 +0000)]

Merge "Add an extra level of indirection to make sure that native IHwBinder"
am: b6dde12ef0

Change-Id: I342d0d1a09ed1677b7619df7df033471b48c937a

commit | commitdiff | tree

Eugene Susla [Mon, 19 Jun 2017 22:02:14 +0000 (22:02 +0000)]

Merge "[Companion] Fix NPE in associate" into oc-dev
am: ba003a97f8

Change-Id: Ib65cfee5e317b03ce57dc4cc695241dc62aaf282

commit | commitdiff | tree

Eugene Susla [Mon, 19 Jun 2017 22:02:13 +0000 (22:02 +0000)]

Merge "[Companion] Fix NPE in associate" into oc-dev
am: ba003a97f8

Change-Id: I690b6d88bcce507d7fbae855cd9939616ac86212

commit | commitdiff | tree

Treehugger Robot [Mon, 19 Jun 2017 21:55:04 +0000 (21:55 +0000)]

Merge "Add an extra level of indirection to make sure that native IHwBinder"

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 21:52:14 +0000 (21:52 +0000)]

Merge "[Companion] Fix NPE in associate" into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Jun 2017 21:26:50 +0000 (21:26 +0000)]

Merge "Merge "Do not update currently open tooltip." into oc-dev am: 139dbe5c1c am: 2102c3211c" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Vladislav Kaznacheev [Mon, 19 Jun 2017 21:24:53 +0000 (21:24 +0000)]

Merge "Do not update currently open tooltip." into oc-dev am: 139dbe5c1c
am: 2102c3211c

Change-Id: I9b58eaa8864140423fbc498b6a32f9ca01082a32

commit | commitdiff | tree

Vladislav Kaznacheev [Mon, 19 Jun 2017 21:24:11 +0000 (21:24 +0000)]

Merge "Do not update currently open tooltip." into oc-dev am: 139dbe5c1c
am: 3fd4215760

Change-Id: I4b9674e73830462bbe9288ebfa1bbac89af860b3

commit | commitdiff | tree

Vladislav Kaznacheev [Mon, 19 Jun 2017 21:12:45 +0000 (21:12 +0000)]

Merge "Do not update currently open tooltip." into oc-dev
am: 139dbe5c1c

Change-Id: Ia3fc1f16e71a4a12a0a84704b7ca7a9d2ec33514

commit | commitdiff | tree

Vladislav Kaznacheev [Mon, 19 Jun 2017 21:12:41 +0000 (21:12 +0000)]

Merge "Do not update currently open tooltip." into oc-dev
am: 139dbe5c1c

Change-Id: Ia0b5b2c7ee9dc8a0cc975562de350ac0ff4a0449

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 21:01:42 +0000 (21:01 +0000)]

Merge "Do not update currently open tooltip." into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Jun 2017 21:00:56 +0000 (21:00 +0000)]

Merge "Merge "Add support for RGBA_F16 readbacks" into oc-dr1-dev am: 43e02a3ec5" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Romain Guy [Mon, 19 Jun 2017 21:00:04 +0000 (21:00 +0000)]

Merge "Add support for RGBA_F16 readbacks" into oc-dr1-dev
am: 43e02a3ec5

Change-Id: I074555de516f6c59cd09db9cff8ece870b640844

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Jun 2017 20:59:35 +0000 (20:59 +0000)]

Merge "Merge "Reduce no-op notification log messages." into oc-dev am: 5e3fb57af8 am: 1ba4f0e1da" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Dan Sandler [Mon, 19 Jun 2017 20:58:43 +0000 (20:58 +0000)]

Merge "Reduce no-op notification log messages." into oc-dev am: 5e3fb57af8
am: 1ba4f0e1da

Change-Id: I1b6fcf9847da63820c8a038ab6b13ed7b89da0d2

commit | commitdiff | tree

Dan Sandler [Mon, 19 Jun 2017 20:56:24 +0000 (20:56 +0000)]

Merge "Reduce no-op notification log messages." into oc-dev am: 5e3fb57af8
am: 0346448a46

Change-Id: Ib361e9e63dae3b0f163f800af8995762070d8c60

commit | commitdiff | tree

Wale Ogunwale [Mon, 19 Jun 2017 20:53:32 +0000 (13:53 -0700)]

Added back removed ctor from DisplayEventReceiver

...because some app can't help but access hidden APIs...

Test: builds
Change-Id: Ia1d4a71b46a53b44e3ebe5844e446009785a90ac
Fixes: 62719884

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 20:49:43 +0000 (20:49 +0000)]

Merge "Add support for RGBA_F16 readbacks" into oc-dr1-dev

commit | commitdiff | tree

Dan Sandler [Mon, 19 Jun 2017 20:45:20 +0000 (20:45 +0000)]

Merge "Reduce no-op notification log messages." into oc-dev
am: 5e3fb57af8

Change-Id: I6835b0804b66ad0ee0ff682b29a728f3cceca0bf

commit | commitdiff | tree

Dan Sandler [Mon, 19 Jun 2017 20:45:16 +0000 (20:45 +0000)]

Merge "Reduce no-op notification log messages." into oc-dev
am: 5e3fb57af8

Change-Id: I3f9d2d574ba20adf66d60c41e68b753e44c9c01a

commit | commitdiff | tree

Hall Liu [Mon, 19 Jun 2017 20:35:44 +0000 (20:35 +0000)]

Merge changes from topics 'embms-init-fix', 'embms-download-2' am: e601160a96 am: d974296f8c
am: b5475ab595

Change-Id: If6c24d1af51bd12ef52b546c610cb2b825c34f88

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 20:32:13 +0000 (20:32 +0000)]

Merge "Reduce no-op notification log messages." into oc-dev

commit | commitdiff | tree

Fan Zhang [Tue, 13 Jun 2017 20:45:21 +0000 (13:45 -0700)]

Add logging constant for wifi tether setting page.

Bug: 37253404
Test: builds
Change-Id: If237e7d7fc02506aa80acfab7929086ac7172a53
(cherry picked from commit 45f3372d736f33e96cb5a214bdaee32e3f2d3f9a)

commit | commitdiff | tree

Qingxi Li [Mon, 19 Jun 2017 20:16:11 +0000 (20:16 +0000)]

Merge "Use EuiccManager API to disable current carrier." into oc-dr1-dev
am: 7979566c72

Change-Id: I37b2cb8245853b54bb8a8eab92eadec2ed94c63d

commit | commitdiff | tree

Hall Liu [Mon, 19 Jun 2017 20:16:07 +0000 (20:16 +0000)]

Merge changes from topics 'embms-init-fix', 'embms-download-2' am: e601160a96
am: d974296f8c

Change-Id: I61d4f04ec27b0298c9ab77dd92bf14d44a1ed93f

commit | commitdiff | tree

Qingxi Li [Mon, 19 Jun 2017 20:07:51 +0000 (20:07 +0000)]

Merge "Use EuiccManager API to disable current carrier." into oc-dr1-dev

commit | commitdiff | tree

Hall Liu [Mon, 19 Jun 2017 20:03:42 +0000 (20:03 +0000)]

Merge changes from topics 'embms-init-fix', 'embms-download-2'
am: e601160a96

Change-Id: Icb84816dc98198ad6ed85dd8b030fbd0198d73a4

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Jun 2017 20:02:03 +0000 (20:02 +0000)]

Merge "Merge "Introduce HapticFeedbackConstants.TEXT_HANDLE_MOVE" into oc-dr1-dev am: 280acdb88b" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Yohei Yukawa [Mon, 19 Jun 2017 20:01:06 +0000 (20:01 +0000)]

Merge "Introduce HapticFeedbackConstants.TEXT_HANDLE_MOVE" into oc-dr1-dev
am: 280acdb88b

Change-Id: Ia58a8d9ad1c387af2fc6c66f928379df08d6792a

commit | commitdiff | tree

Jakub Pawlowski [Mon, 19 Jun 2017 19:53:44 +0000 (19:53 +0000)]

Merge "Remove legacy advertiser from map after it's no longer used" am: 42b1578867 am: de1f0d7607
am: 8dce179b79

Change-Id: Ic861fcf0507546f522046193939488607a01a042

commit | commitdiff | tree

Hall Liu [Mon, 19 Jun 2017 19:53:40 +0000 (19:53 +0000)]

Merge changes from topics 'embms-init-fix', 'embms-download-2'

* changes:
Add callback for initialization done
Embms download part 2

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 19:44:45 +0000 (19:44 +0000)]

Merge "Introduce HapticFeedbackConstants.TEXT_HANDLE_MOVE" into oc-dr1-dev

commit | commitdiff | tree

Jakub Pawlowski [Mon, 19 Jun 2017 19:40:38 +0000 (19:40 +0000)]

Merge "Remove legacy advertiser from map after it's no longer used" am: 42b1578867
am: de1f0d7607

Change-Id: I89b5be7443dff10a3a52a0b6dbee76a5d34b8173

commit | commitdiff | tree

Jakub Pawlowski [Mon, 19 Jun 2017 19:26:32 +0000 (19:26 +0000)]

Merge "Remove legacy advertiser from map after it's no longer used"
am: 42b1578867

Change-Id: I8f6f49f0d75c840faa8a7dbdb56a1debecd28d97

commit | commitdiff | tree

Treehugger Robot [Mon, 19 Jun 2017 19:17:38 +0000 (19:17 +0000)]

Merge "Remove legacy advertiser from map after it's no longer used"

commit | commitdiff | tree

Andreas Huber [Fri, 16 Jun 2017 21:56:12 +0000 (14:56 -0700)]

Add an extra level of indirection to make sure that native IHwBinder

objects, while alive, maintain a strong reference to their Java
counterpart.

Bug: 33042939
Test: hidl_test_java
Change-Id: I69179772b3218705e9ef46cbb10b21b6473280d6

commit | commitdiff | tree

Daniel Nishi [Mon, 19 Jun 2017 17:55:32 +0000 (17:55 +0000)]

Merge "Flag the DH no threshold options menu." into oc-dr1-dev
am: f69d450b6f

Change-Id: I44ea7994178ca700555479bd5901779c4639f604

commit | commitdiff | tree

Daniel Nishi [Mon, 19 Jun 2017 17:45:16 +0000 (17:45 +0000)]

Merge "Flag the DH no threshold options menu." into oc-dr1-dev

commit | commitdiff | tree

Jakub Pawlowski [Wed, 14 Jun 2017 01:59:07 +0000 (18:59 -0700)]

Remove legacy advertiser from map after it's no longer used

Test: manual
Bug: 62597369
Change-Id: Ief1e1b054f29b59b1ed72514b138d4f209f9847a

Use EuiccManager API to disable current carrier.

Bug: 37353596
Test: existing test
Change-Id: I71e9ab13f48de07d4c7b9e25aabfa3c49dda6fb4

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Jun 2017 17:21:15 +0000 (17:21 +0000)]

Merge "Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev am: 8a95d49d8f am: a7853c75b8" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Dianne Hackborn [Mon, 19 Jun 2017 17:19:19 +0000 (17:19 +0000)]

Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev am: 8a95d49d8f
am: a7853c75b8

Change-Id: Ifc9d98444bffb923ecbda3d125f50e5a1adf396d

commit | commitdiff | tree

Dianne Hackborn [Mon, 19 Jun 2017 17:18:53 +0000 (17:18 +0000)]

Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev am: 8a95d49d8f
am: 54c10dca58

Change-Id: Ib4418fa8e1bf1660b622b9015a08a3ea375d2d07

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Jun 2017 17:16:10 +0000 (17:16 +0000)]

Merge "Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am: 58df6ab93f am: 04171ecb31" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Dianne Hackborn [Mon, 19 Jun 2017 17:13:26 +0000 (17:13 +0000)]

Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev
am: 8a95d49d8f

Change-Id: I2d59709712d96b78e1bd5d634e6c31cc0a0d6ff0

commit | commitdiff | tree

Siyamed Sinir [Mon, 19 Jun 2017 17:13:23 +0000 (17:13 +0000)]

Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am: 58df6ab93f
am: 92d86d59c0

Change-Id: I690ebf4df8e22a57c5f7b2b5e0267a550db15945

commit | commitdiff | tree

Dianne Hackborn [Mon, 19 Jun 2017 17:13:19 +0000 (17:13 +0000)]

Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev
am: 8a95d49d8f

Change-Id: I40b069c811b9cc687265f802524b8b290cd4f269

commit | commitdiff | tree

Siyamed Sinir [Mon, 19 Jun 2017 17:13:19 +0000 (17:13 +0000)]

Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am: 58df6ab93f
am: 04171ecb31

Change-Id: I3306e0fd1a7fdf211e330c0a53787f9b1eb5ef1c

commit | commitdiff | tree

Siyamed Sinir [Mon, 19 Jun 2017 17:05:27 +0000 (17:05 +0000)]

Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev
am: 58df6ab93f

Change-Id: Ic6b3aa97edffd87e643a778d73aa61e890f52a4b

commit | commitdiff | tree

Dianne Hackborn [Mon, 19 Jun 2017 17:04:04 +0000 (17:04 +0000)]

Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev

commit | commitdiff | tree

Siyamed Sinir [Mon, 19 Jun 2017 17:03:17 +0000 (17:03 +0000)]

Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev
am: 58df6ab93f

Change-Id: Icd240aa9e5881067acd7521e4235692c5a538b29

commit | commitdiff | tree

Siyamed Sinir [Mon, 19 Jun 2017 16:53:11 +0000 (16:53 +0000)]

Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Jun 2017 15:45:16 +0000 (15:45 +0000)]

Merge "Merge "Fix flash of ambient on fp unlock" into oc-dev am: c885c24e10 am: 31c2f1e881" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jason Monk [Mon, 19 Jun 2017 15:43:15 +0000 (15:43 +0000)]

Merge "Fix flash of ambient on fp unlock" into oc-dev am: c885c24e10
am: 31c2f1e881

Change-Id: Icd1e169bb9538e1ac778469393f4a3be7880368b

commit | commitdiff | tree

Jason Monk [Mon, 19 Jun 2017 15:43:14 +0000 (15:43 +0000)]

Merge "Fix flash of ambient on fp unlock" into oc-dev am: c885c24e10
am: 1a2133629f

Change-Id: I6f3514154e75a74c69bdf5292dc73783e652a9ec

commit | commitdiff | tree

Jason Monk [Mon, 19 Jun 2017 15:33:21 +0000 (15:33 +0000)]

Merge "Fix flash of ambient on fp unlock" into oc-dev
am: c885c24e10

Change-Id: Ibbff840983dc3f15745275d44393645f110b74c1

commit | commitdiff | tree

Jason Monk [Mon, 19 Jun 2017 15:33:12 +0000 (15:33 +0000)]

Merge "Fix flash of ambient on fp unlock" into oc-dev
am: c885c24e10

Change-Id: I70a913e7743e79e90e3d5c1e8bbcb8e6a4071193

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 15:26:11 +0000 (15:26 +0000)]

Merge "Fix flash of ambient on fp unlock" into oc-dev

commit | commitdiff | tree

Erik Kline [Mon, 19 Jun 2017 13:37:15 +0000 (13:37 +0000)]

Merge "Make interface IP serving code set LinkProperties" am: 1dae9a4709 am: 9461f78541
am: 5219f643dd

Change-Id: I39a1744a7fa9b91e3b607429c79f39578e9bde19

commit | commitdiff | tree

Erik Kline [Mon, 19 Jun 2017 13:26:13 +0000 (13:26 +0000)]

Merge "Make interface IP serving code set LinkProperties" am: 1dae9a4709
am: 9461f78541

Change-Id: I753ab701f2109c0972816724e73119dc1dbc4dca

commit | commitdiff | tree

Erik Kline [Mon, 19 Jun 2017 13:15:02 +0000 (13:15 +0000)]

Merge "Make interface IP serving code set LinkProperties"
am: 1dae9a4709

Change-Id: I84e4b3fb0be210f59eb663597a6c81c95d3e51d6

commit | commitdiff | tree

Treehugger Robot [Mon, 19 Jun 2017 13:00:34 +0000 (13:00 +0000)]

Merge "Make interface IP serving code set LinkProperties"

commit | commitdiff | tree

Alessio Balsini [Mon, 19 Jun 2017 12:04:37 +0000 (12:04 +0000)]

Merge "Documentation: changed tid parameter description for getThreadPriority()" am: 663b02dd28 am: 6f0adbfaea
am: fd88d146b4

Change-Id: Iab127e59a59c959e9cd100dff68f415415b0bcce

commit | commitdiff | tree

Alessio Balsini [Mon, 19 Jun 2017 11:54:05 +0000 (11:54 +0000)]

Merge "Documentation: changed tid parameter description for getThreadPriority()" am: 663b02dd28
am: 6f0adbfaea

Change-Id: I0626fb2d9de978f204ba9898a56e4225a71f03e8

commit | commitdiff | tree

Alessio Balsini [Mon, 19 Jun 2017 11:43:00 +0000 (11:43 +0000)]

Merge "Documentation: changed tid parameter description for getThreadPriority()"
am: 663b02dd28

Change-Id: I4953cf4bf4af592e080114bf937453b84b4a3e4e

commit | commitdiff | tree

Treehugger Robot [Mon, 19 Jun 2017 11:29:58 +0000 (11:29 +0000)]

Merge "Documentation: changed tid parameter description for getThreadPriority()"

commit | commitdiff | tree

Alessio Balsini [Wed, 7 Jun 2017 09:41:33 +0000 (11:41 +0200)]

Documentation: changed tid parameter description for getThreadPriority()

Wrong description of the "tid" parameter used by getThreadPriority():
the function does not "change" the priority of the thread associated to
"tid".
Defined also the meaning of setting tid parameter to 0.

Test: None

Change-Id: I8552f3b110eaab1aefa51477e82d3e295547be34
Signed-off-by: Alessio Balsini <alessio.balsini@gmail.com>

commit | commitdiff | tree

Erik Kline [Mon, 19 Jun 2017 08:40:21 +0000 (08:40 +0000)]

Merge "make UpsreamNetworkMonitor the sole source of upstream network information" into oc-dr1-dev
am: 7284e2a88b -s ours

Change-Id: I90181d2ce6f3c5f65110aa53ae81e657d9894fcd

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 08:31:31 +0000 (08:31 +0000)]

Merge "make UpsreamNetworkMonitor the sole source of upstream network information" into oc-dr1-dev

commit | commitdiff | tree

Erik Kline [Mon, 12 Jun 2017 09:20:08 +0000 (18:20 +0900)]

Make interface IP serving code set LinkProperties

Additionally, clean up awkward IPv6TetheringInterfaceServices
instantiation mechanics.  In future, this class will be absorbed
by TetherInterfaceStateMachine (prior to its renaming to IpServer).

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 32163131

Change-Id: Ib620e3df182f9f8e2c019aae1cd8981eb0b29376

commit | commitdiff | tree

Zhijun He [Mon, 19 Jun 2017 05:04:29 +0000 (05:04 +0000)]

Merge "Camera2: copy user tag to HFR request list" into oc-dr1-dev
am: a34c04d5c3

Change-Id: Ie7fbfc6948f19c36a487defffa4ca0a10e8eae66

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 04:56:51 +0000 (04:56 +0000)]

Merge "Camera2: copy user tag to HFR request list" into oc-dr1-dev

Merge "Adds error codes and maximum RAN/Bands/Channels" into oc-dr1-dev
am: 38529959bf -s ours

Change-Id: Ie44630dcc12ad16e326c70a6633e509bcf7012ff

Merge "Adds error codes and maximum RAN/Bands/Channels" into oc-dr1-dev

commit | commitdiff | tree

Zhijun He [Sun, 18 Jun 2017 23:21:51 +0000 (16:21 -0700)]

Camera2: copy user tag to HFR request list

User tag is not part of native metadata, and need carry over explicitly.

Test: Camera CTS
Bug: 33761753
Change-Id: Ic58783fc204ce71e073f71d0fa50d4d961f4e7ce

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 18 Jun 2017 17:26:19 +0000 (17:26 +0000)]

Merge "Merge "Track both framework and app overlays per package" into oc-dev am: 65ffdba7f7 am: 895b695ab0" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Todd Kennedy [Sun, 18 Jun 2017 17:24:09 +0000 (17:24 +0000)]

Merge "Track both framework and app overlays per package" into oc-dev am: 65ffdba7f7
am: c36175d754

Change-Id: I74774dac4da9a9f270f3ca66780664c82a1a3c05

commit | commitdiff | tree

Todd Kennedy [Sun, 18 Jun 2017 17:24:07 +0000 (17:24 +0000)]

Merge "Track both framework and app overlays per package" into oc-dev am: 65ffdba7f7
am: 895b695ab0

Change-Id: I158aeb4a8327454a067310c7ba51c8487ada5c8d

commit | commitdiff | tree

Todd Kennedy [Sun, 18 Jun 2017 17:15:12 +0000 (17:15 +0000)]

Merge "Track both framework and app overlays per package" into oc-dev
am: 65ffdba7f7

Change-Id: I4af23140f4d9ecc2c1e9faa09d03eddb22db9dae

commit | commitdiff | tree

Todd Kennedy [Sun, 18 Jun 2017 17:15:07 +0000 (17:15 +0000)]

Merge "Track both framework and app overlays per package" into oc-dev
am: 65ffdba7f7

Change-Id: Ib58b5ed03daa375c0ba667829d4a38567c99ac78

commit | commitdiff | tree

Todd Kennedy [Sun, 18 Jun 2017 17:06:17 +0000 (17:06 +0000)]

Merge "Track both framework and app overlays per package" into oc-dev

commit | commitdiff | tree

Eric Laurent [Sun, 18 Jun 2017 05:24:33 +0000 (05:24 +0000)]

Merge "AudioService: implement safe volume warning for USB Headsets" into oc-dr1-dev
am: 95b41415cd

Change-Id: Ib0b79a1526c32fcd7c4cc253feac77ba0f4d3bae

commit | commitdiff | tree

TreeHugger Robot [Sun, 18 Jun 2017 05:15:31 +0000 (05:15 +0000)]

Merge "AudioService: implement safe volume warning for USB Headsets" into oc-dr1-dev

commit | commitdiff | tree

Lucas Dupin [Sat, 17 Jun 2017 17:26:20 +0000 (17:26 +0000)]

Merge "K-Means color clustering" into oc-dr1-dev
am: 11cc260047

Change-Id: If99425cb57a322900f476227932cdcadd85abf00