OSDN Git Service
Sudheer Shanka [Tue, 20 Jun 2017 02:05:31 +0000 (19:05 -0700)]
Shorten the log in the netpolicy dump.
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Change-Id: I105326e733f2498e68b0552b45fec1ed0e8e3179
TreeHugger Robot [Mon, 19 Jun 2017 22:03:05 +0000 (22:03 +0000)]
Merge "AAPT2: Read config from disk"
Vladislav Kaznacheev [Mon, 19 Jun 2017 21:40:13 +0000 (21:40 +0000)]
Merge "Merge "Do not update currently open tooltip." into oc-dev am:
139dbe5c1c am:
2102c3211c" into oc-dr1-dev-plus-aosp
am:
33fee82777
Change-Id: I5650f26634c5dbeecea485782d9451315f96bcaf
Vladislav Kaznacheev [Mon, 19 Jun 2017 21:37:31 +0000 (21:37 +0000)]
Merge "Do not update currently open tooltip." into oc-dev am:
139dbe5c1c am:
3fd4215760
am:
6063096518
Change-Id: I5e7b6742544a5db4266e95be0ce01830ea62cd92
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
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
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
Romain Guy [Mon, 19 Jun 2017 21:14:29 +0000 (21:14 +0000)]
Merge "Merge "Add support for RGBA_F16 readbacks" into oc-dr1-dev am:
43e02a3ec5" into oc-dr1-dev-plus-aosp
am:
375206c86d
Change-Id: I920cea7cedfd1a91ce7cdaf8d89c3ad45884b030
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
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
Dan Sandler [Mon, 19 Jun 2017 21:11:58 +0000 (21:11 +0000)]
Merge "Merge "Reduce no-op notification log messages." into oc-dev am:
5e3fb57af8 am:
1ba4f0e1da" into oc-dr1-dev-plus-aosp
am:
3a2b90da20
Change-Id: I1665e5bc17bfdf9f14260b27613c968ac30fb311
Dan Sandler [Mon, 19 Jun 2017 21:07:18 +0000 (21:07 +0000)]
Merge "Reduce no-op notification log messages." into oc-dev am:
5e3fb57af8 am:
0346448a46
am:
1f2194c838
Change-Id: Id354e4e5868240ce87fabd57747b98381aef81f4
TreeHugger Robot [Mon, 19 Jun 2017 21:01:42 +0000 (21:01 +0000)]
Merge "Do not update currently open tooltip." into oc-dev
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
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
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
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
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
Hall Liu [Mon, 19 Jun 2017 20:53:17 +0000 (20:53 +0000)]
Merge changes from topics 'embms-init-fix', 'embms-download-2' am:
e601160a96 am:
d974296f8c am:
b5475ab595
am:
1a47b93423
Change-Id: Ic67525d9ffe4074f981bb2832ddc9226ce19e5e2
Fyodor Kupolov [Mon, 19 Jun 2017 20:50:31 +0000 (20:50 +0000)]
Merge "Avoid using global PM lock in isProtectedBroadcast"
TreeHugger Robot [Mon, 19 Jun 2017 20:49:43 +0000 (20:49 +0000)]
Merge "Add support for RGBA_F16 readbacks" into oc-dr1-dev
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
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
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
Jian Sun [Mon, 19 Jun 2017 20:33:48 +0000 (20:33 +0000)]
Merge "Currently, when an account with USER_MANAGED_NOT_VISIBLE is chosen in ChooseAccountActivity, its visibility doesn't get updated. However, it is supposed to be updated to USER_MANAGED_VISIBLE."
TreeHugger Robot [Mon, 19 Jun 2017 20:32:13 +0000 (20:32 +0000)]
Merge "Reduce no-op notification log messages." into oc-dev
Qingxi Li [Mon, 19 Jun 2017 20:21:00 +0000 (20:21 +0000)]
Merge "Use EuiccManager API to disable current carrier." into oc-dr1-dev am:
7979566c72
am:
4ceb1e0ae0
Change-Id: I606f503fed5eeb063d397e1d4ad2c02b490c3213
Yohei Yukawa [Mon, 19 Jun 2017 20:16:39 +0000 (20:16 +0000)]
Merge "Merge "Introduce HapticFeedbackConstants.TEXT_HANDLE_MOVE" into oc-dr1-dev am:
280acdb88b" into oc-dr1-dev-plus-aosp
am:
ffc014dfcc
Change-Id: I6aebfd5c56c9ab0f4b61eb837e90cc26f7e016fb
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
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
Jakub Pawlowski [Mon, 19 Jun 2017 20:13:36 +0000 (20:13 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used" am:
42b1578867 am:
de1f0d7607 am:
8dce179b79
am:
6955d4485e
Change-Id: I1714e5d54b13641798907b5c0e779f779f455bb6
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
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
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
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
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
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
Shane Farmer [Wed, 14 Jun 2017 16:10:28 +0000 (09:10 -0700)]
AAPT2: Read config from disk
Implement the todo left from last change to read the contents of the
configuration file from disk. Since this is an operation that may fail
the API was changed to take return a Maybe to indicate errors reading
the file.
Test: unit test for error condition
Test: ran aapt2 optimize with the new code path wired in
Change-Id: I93d532b4a57af9520231225eee4fc5f2b1a046b9
TreeHugger Robot [Mon, 19 Jun 2017 19:44:45 +0000 (19:44 +0000)]
Merge "Introduce HapticFeedbackConstants.TEXT_HANDLE_MOVE" into oc-dr1-dev
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
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
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"
Fyodor Kupolov [Fri, 16 Jun 2017 00:05:24 +0000 (17:05 -0700)]
Avoid using global PM lock in isProtectedBroadcast
Otherwise it sometimes blocks ActivityManager for 100+ ms.
Test: manual
Bug:
62352844
Change-Id: I9b821551ba6ac884df68a164d888035e705b6f51
Daniel Nishi [Mon, 19 Jun 2017 18:07:13 +0000 (18:07 +0000)]
Merge "Flag the DH no threshold options menu." into oc-dr1-dev am:
f69d450b6f
am:
5cecfe5b0a
Change-Id: Ibc39e8545525925941c806f35105a73e0cf971f8
sunjian [Wed, 7 Jun 2017 00:54:07 +0000 (17:54 -0700)]
Currently, when an account with USER_MANAGED_NOT_VISIBLE is chosen
in ChooseAccountActivity, its visibility doesn't get updated.
However, it is supposed to be updated to USER_MANAGED_VISIBLE.
Bug:
62067445
Test: manual
Change-Id: I2fb942a96d07dff06a53bc48a16ff337c50f3a26
Julia Reynolds [Mon, 19 Jun 2017 17:59:00 +0000 (17:59 +0000)]
Merge "Migrate managed services from setting to policy xml"
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
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
Dianne Hackborn [Mon, 19 Jun 2017 17:43:38 +0000 (17:43 +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
am:
ccf1479054
Change-Id: Ia9a577a93ae9714e7d4a5048fa509c34c7faa13f
Julia Reynolds [Tue, 6 Jun 2017 20:14:18 +0000 (16:14 -0400)]
Migrate managed services from setting to policy xml
Change-Id: Ie20f91dbdd0ba6b57b5909cbf0152a32754fe02d
Fixes:
62263757
Test: runtest systemui-notification, cts AudioManagerTest,
cts-verifier DND tests, verify bug reports after toggling
access for various types of managed services, verified
default approved services aren't renabled on boot; verified that
they are reenabled after a device reset, verified that
settings are migrated after a restore from OC backup.
TreeHugger Robot [Mon, 19 Jun 2017 17:39:57 +0000 (17:39 +0000)]
Merge "Hide IME when switching to Radial Time Picker"
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
Dianne Hackborn [Mon, 19 Jun 2017 17:30:55 +0000 (17:30 +0000)]
Merge "Maybe fix issue #
62199092: Alarm didn't ring, upcoming alarm..." into oc-dev am:
8a95d49d8f am:
54c10dca58
am:
8323830495
Change-Id: Ie4fe65681b0fa537288923154f84794dfa779dfc
Siyamed Sinir [Mon, 19 Jun 2017 17:28:04 +0000 (17:28 +0000)]
Merge "Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am:
58df6ab93f am:
04171ecb31" into oc-dr1-dev-plus-aosp
am:
8e8a88ee0f
Change-Id: Ia2373803193ec498824a2808c3401e64c8301174
qingxi [Wed, 24 May 2017 23:04:32 +0000 (16:04 -0700)]
Use EuiccManager API to disable current carrier.
Bug:
37353596
Test: existing test
Change-Id: I71e9ab13f48de07d4c7b9e25aabfa3c49dda6fb4
Siyamed Sinir [Mon, 19 Jun 2017 17:24:27 +0000 (17:24 +0000)]
Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am:
58df6ab93f am:
92d86d59c0
am:
4c6d3ba183
Change-Id: I06ed6fea1fe414e7a33694047b0e6e903b7816bb
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Mon, 19 Jun 2017 16:58:05 +0000 (16:58 +0000)]
Merge "Add periodic sync support to requestsync."
Siyamed Sinir [Mon, 19 Jun 2017 16:53:11 +0000 (16:53 +0000)]
Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev
Jason Monk [Mon, 19 Jun 2017 15:56:45 +0000 (15:56 +0000)]
Merge "Merge "Fix flash of ambient on fp unlock" into oc-dev am:
c885c24e10 am:
31c2f1e881" into oc-dr1-dev-plus-aosp
am:
a24fdfd317
Change-Id: I5bc39949909385bd87cfffeb70a5df2e55054589
Jason Monk [Mon, 19 Jun 2017 15:54:20 +0000 (15:54 +0000)]
Merge "Fix flash of ambient on fp unlock" into oc-dev am:
c885c24e10 am:
1a2133629f
am:
c2b629c61e
Change-Id: Ibf4d518b1292e6768df43d65c71923921448043f
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
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
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
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
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
TreeHugger Robot [Mon, 19 Jun 2017 15:26:11 +0000 (15:26 +0000)]
Merge "Fix flash of ambient on fp unlock" into oc-dev
Erik Kline [Mon, 19 Jun 2017 13:48:11 +0000 (13:48 +0000)]
Merge "Make interface IP serving code set LinkProperties" am:
1dae9a4709 am:
9461f78541 am:
5219f643dd
am:
576d67b453
Change-Id: I8b15edbf04c10cd9429da079c6b79352a6740b3b
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
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
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
Treehugger Robot [Mon, 19 Jun 2017 13:00:34 +0000 (13:00 +0000)]
Merge "Make interface IP serving code set LinkProperties"
Alessio Balsini [Mon, 19 Jun 2017 12:15:41 +0000 (12:15 +0000)]
Merge "Documentation: changed tid parameter description for getThreadPriority()" am:
663b02dd28 am:
6f0adbfaea am:
fd88d146b4
am:
537782f395
Change-Id: I38896f0929aabf60444882a79cda6ae8290763f3
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
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
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
Treehugger Robot [Mon, 19 Jun 2017 11:29:58 +0000 (11:29 +0000)]
Merge "Documentation: changed tid parameter description for getThreadPriority()"
Erik Kline [Mon, 19 Jun 2017 08:50:49 +0000 (08:50 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" into oc-dr1-dev am:
7284e2a88b -s ours
am:
6d50b1aefc -s ours
Change-Id: I9e7d7dfdd09a31018421ed904da5665ff526ca3f
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>
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
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
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
Zhijun He [Mon, 19 Jun 2017 05:14:31 +0000 (05:14 +0000)]
Merge "Camera2: copy user tag to HFR request list" into oc-dr1-dev am:
a34c04d5c3
am:
71e07faafb
Change-Id: I5fad04f7a8e3f2f2ba19204e19d41e256b6a1a6e
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
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
Ying Xu [Mon, 19 Jun 2017 04:49:29 +0000 (04:49 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" into oc-dr1-dev am:
38529959bf -s ours
am:
008bc4f265 -s ours
Change-Id: I41e60974e787e66d56a70e8349e1d1c8ad05db90
Ying Xu [Mon, 19 Jun 2017 04:39:04 +0000 (04:39 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" into oc-dr1-dev
am:
38529959bf -s ours
Change-Id: Ie44630dcc12ad16e326c70a6633e509bcf7012ff
Ying Xu [Mon, 19 Jun 2017 04:30:23 +0000 (04:30 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" into oc-dr1-dev
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
Todd Kennedy [Sun, 18 Jun 2017 17:36:12 +0000 (17:36 +0000)]
Merge "Merge "Track both framework and app overlays per package" into oc-dev am:
65ffdba7f7 am:
895b695ab0" into oc-dr1-dev-plus-aosp
am:
80c75595b8
Change-Id: Ic303e2a8cd2ee5362f3879993764a561adcb21a5
OSDN Git Service
