Christopher Wiley
d73faf0760
Notify NetworkPolicyManagerService on tethering changes
...
No longer do this in ConnectivityService#tether/untether.
Instead, have Tethering do it when an interface is actually
tethered.
Bug: 31405407
Test: Toggling hotspot now disables data saver
Change-Id: I9910a2e488c30c92d45f817c8f5df0fac5510de6
2016-09-20 15:18:50 -07:00
Christopher Wiley
c185893e9c
Merge "Allow WiFi components to manage interface up state" am: dfa6e6f186
...
am: b666aa899d
2016-09-20 21:47:10 +00:00
Christopher Wiley
b666aa899d
Merge "Allow WiFi components to manage interface up state"
...
am: dfa6e6f186
2016-09-20 21:41:03 +00:00
Greg Hackmann
a0126e0857
AlarmManagerService: explain some timerfd_create() failures
...
When AlarmManagerService is broken, starting the framework fails in
weird and inconsistent ways. So if we detect your kernel is missing the
required timerfd support, give up immediately and explain why.
Bug: 28357356
Test: manually break timerfd_create syscall, check adb logcat during boot
Change-Id: Iaa153fca38e9cd8e801f3e71c3e1ae2351907828
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2016-09-20 14:33:28 -07:00
Treehugger Robot
dfa6e6f186
Merge "Allow WiFi components to manage interface up state"
2016-09-20 21:27:54 +00:00
Andreas Huber
60c722812c
Merge "Removed legacy code used to read/write java arrays from HwBinder parcels." am: eda7bc5c84
...
am: 618e39a3be
2016-09-20 20:59:31 +00:00
Adarsh Fernando
c9905d9184
Temporary redirect for CMake Variables list.
...
Change-Id: I7d6fd1afaa342d74bbede2721a6b8d3a2117fb25
2016-09-20 13:53:25 -07:00
Andreas Huber
618e39a3be
Merge "Removed legacy code used to read/write java arrays from HwBinder parcels."
...
am: eda7bc5c84
2016-09-20 20:48:53 +00:00
Scott Main
40b7598f1c
Merge "update metadata for the studio landing page cards (for 2.2 content) edit landing page banner ("a dozen" --> "20")" into nyc-dev
...
am: a1c28fa8d8
2016-09-20 20:48:34 +00:00
smain@google.com
d7c3be89df
update metadata for the studio landing page cards (for 2.2 content) edit landing page banner ("a dozen" --> "20")
...
am: 0e98b64adf
2016-09-20 20:48:29 +00:00
Treehugger Robot
eda7bc5c84
Merge "Removed legacy code used to read/write java arrays from HwBinder parcels."
2016-09-20 20:28:12 +00:00
Scott Main
a1c28fa8d8
Merge "update metadata for the studio landing page cards (for 2.2 content) edit landing page banner ("a dozen" --> "20")" into nyc-dev
2016-09-20 20:26:12 +00:00
Fan Zhang
51365c3b4c
Fix NPE for WifiConfiguration in AccessPoint.
...
In getSummary methods, make a local reference to WifiConfig before
accessing the fields to prevent member variable mConfig being reset in a
different thread.
Bug: 31617798
Test: manually open/close/refresh wifi settings and see no crash.
Change-Id: I254cb3cb59dead425a9ada17d9e84a7e2974f738
2016-09-20 19:31:27 +00:00
smain@google.com
0e98b64adf
update metadata for the studio landing page cards (for 2.2 content)
...
edit landing page banner ("a dozen" --> "20")
Change-Id: Iccad4faab12930eac9fe58b5c84ba08d444fbee6
2016-09-20 18:41:56 +00:00
Mary Yanchar
140c793b0c
Merge "Small change for new sample test code" into nyc-dev
...
am: e5e9265e09
2016-09-20 18:26:32 +00:00
Mary Yanchar
be34171986
Small change for new sample test code
...
am: acb3eb39da
2016-09-20 18:26:27 +00:00
Mary Yanchar
e5e9265e09
Merge "Small change for new sample test code" into nyc-dev
2016-09-20 18:19:24 +00:00
Jordan Liu
8594e87005
Remove configs in frameworks/base
...
Remove old configs within frameworks/base. With move to CarrierConfig no
need for the old config_cdma_3waycall_flash_delay resources.
Note that the new carrier_config files replace all values with 300
instead of leaving some as 70 and some as 300. The configs that set the
value to 70 were to fix http://b/17331584 , and the configs that set the
value to 300 fixed http://b/24638158 . It seems like as long as the value
is above 70ms both bugs should stay resolved.
Merged-In: I15d54e09a4b474b1f83a05cbe777c826cdef368f
Bug: 29873049
Change-Id: I15d54e09a4b474b1f83a05cbe777c826cdef368f
2016-09-20 11:19:11 -07:00
Jordan Liu
bd3f2a7eb0
Add cdma_3waycall_flash_delay key to CarrierConfig
...
Add KEY_CDMA_3WAYCALL_FLASH_DELAY_INT and default value to
CarrierConfigManager, and remove the references to the old config in
core/res/res/values/[config.xml/symbols.xml]
Merged-In: I53dc93defbfa7d1366e6ee066638d73df03f88d0
Bug: 29873049
Change-Id: I53dc93defbfa7d1366e6ee066638d73df03f88d0
2016-09-20 11:10:39 -07:00
Greg Hackmann
d7151c06f1
AlarmManagerService: remove legacy /dev/alarm support
...
We've removed the Android alarm driver from our supported kernels. It's
time to remove the userspace callers too: they make the native side of
AlarmManagerService more complex, and send the wrong signal about
/dev/alarm still being supported.
Bug: 28357356
Test: cts-tradefed run singleCommand cts -d -c android.app.cts.AlarmManagerTest
Change-Id: I619e2d8a98e4c4728131a2d826b1295f858abedd
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2016-09-20 10:35:40 -07:00
Scott Main
9340130a5e
Merge changes from topic 'n-versioncode' into nyc-dev
...
am: 99ec81ab46
2016-09-20 17:07:22 +00:00
Dianne Hackborn
3da7e4e563
A little more on issue #30766518 : Document what targeting N does
...
am: da6be5b871
2016-09-20 17:07:15 +00:00
Dianne Hackborn
bae14052a0
Cherrypick so we can publish N version code description ASAP
...
am: 491bc2b8d6
2016-09-20 17:05:09 +00:00
Etan Cohen
ad864c8fd9
Merge "[NAN] Rename to make discovery explicit" am: 5706a8f535
...
am: eb4c838c46
2016-09-20 16:58:32 +00:00
Scott Main
99ec81ab46
Merge changes from topic 'n-versioncode' into nyc-dev
...
* changes:
A little more on issue #30766518 : Document what targeting N does
Cherrypick so we can publish N version code description ASAP
2016-09-20 16:56:57 +00:00
Etan Cohen
eb4c838c46
Merge "[NAN] Rename to make discovery explicit"
...
am: 5706a8f535
2016-09-20 16:50:01 +00:00
Etan Cohen
5706a8f535
Merge "[NAN] Rename to make discovery explicit"
2016-09-20 16:41:04 +00:00
Rebecca Silberstein
6d2cca0f43
Merge "WifiScanner: retrieve single scan results" am: 3c70a2fad2
...
am: c507bcaf63
2016-09-20 16:04:40 +00:00
Rebecca Silberstein
c507bcaf63
Merge "WifiScanner: retrieve single scan results"
...
am: 3c70a2fad2
2016-09-20 15:58:17 +00:00
Rebecca Silberstein
3c70a2fad2
Merge "WifiScanner: retrieve single scan results"
2016-09-20 15:50:08 +00:00
Sudheer Shanka
f6ce0bfda9
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03 am: 1c2e8848dc -s ours
...
am: fba3187084
2016-09-20 09:08:13 +00:00
Sudheer Shanka
b5a0a8ab2b
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0 am: 5753af889b -s ours
...
am: 4c77b60440
2016-09-20 09:02:40 +00:00
Sudheer Shanka
fba3187084
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03
...
am: 1c2e8848dc
2016-09-20 08:32:59 +00:00
Sudheer Shanka
4c77b60440
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0
...
am: 5753af889b
2016-09-20 08:28:33 +00:00
Sudheer Shanka
3a87b6773b
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492 am: 8d302da986 -s ours
...
am: 7efc56cc65
2016-09-20 08:00:37 +00:00
Sudheer Shanka
1c2e8848dc
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c
...
am: badb5f2a03
2016-09-20 06:34:19 +00:00
Sudheer Shanka
7efc56cc65
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492
...
am: 8d302da986
2016-09-20 06:33:24 +00:00
Sudheer Shanka
5753af889b
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9
...
am: 62c6ce4ca0
2016-09-20 06:32:39 +00:00
Sudheer Shanka
badb5f2a03
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7
...
am: 7fd31ca09c
2016-09-20 05:54:37 +00:00
Sudheer Shanka
34a5ce150d
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 am: 042fb63071 am: 3c7e989835 -s ours
...
am: eacf98bf52
2016-09-20 05:53:25 +00:00
Sudheer Shanka
8d302da986
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc
...
am: 827f465492
2016-09-20 05:53:17 +00:00
Sudheer Shanka
62c6ce4ca0
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea
...
am: 71bb55afd9
2016-09-20 05:51:05 +00:00
Sudheer Shanka
827f465492
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09
...
am: 8fedc773fc
2016-09-20 05:34:00 +00:00
Sudheer Shanka
7fd31ca09c
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours
...
am: 29e4cd66d7
2016-09-20 05:23:59 +00:00
Sudheer Shanka
71bb55afd9
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours
...
am: 1310d53aea
2016-09-20 05:14:33 +00:00
Sudheer Shanka
8fedc773fc
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours
...
am: b235bc6f09
2016-09-20 05:06:22 +00:00
Sudheer Shanka
eacf98bf52
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 am: 042fb63071
...
am: 3c7e989835
2016-09-20 04:42:51 +00:00
Sudheer Shanka
3c7e989835
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15
...
am: 042fb63071
2016-09-20 04:11:52 +00:00
Sudheer Shanka
b7fb715a80
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b am: f428d49b12 am: 21d4b84547 am: 94b739d3a2 -s ours
...
am: 3f8c97465d
2016-09-20 03:26:43 +00:00
Sudheer Shanka
29e4cd66d7
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df
...
am: 2f0228c153
2016-09-20 03:19:49 +00:00
