OSDN Git Service
Erik Kline [Fri, 6 Oct 2017 07:35:06 +0000 (07:35 +0000)]
Merge "Log NAT update descriptions when receiving netlink errors" into oc-mr1-dev
am:
9dfbb0ead9
Change-Id: Ia1f0b97f89a9848a64099d01184fcbc2056a1b34
TreeHugger Robot [Fri, 6 Oct 2017 07:21:43 +0000 (07:21 +0000)]
Merge "Log NAT update descriptions when receiving netlink errors" into oc-mr1-dev
Mike Ma [Fri, 6 Oct 2017 07:17:25 +0000 (07:17 +0000)]
Merge "Add AOD metrics in batterystats" into oc-mr1-dev
am:
6204a60c53
Change-Id: Ife567f987a1585cb1108725db6ad63516a8dc67a
Mike Ma [Fri, 6 Oct 2017 07:01:36 +0000 (07:01 +0000)]
Merge "Add AOD metrics in batterystats" into oc-mr1-dev
Chong Zhang [Fri, 6 Oct 2017 05:29:43 +0000 (05:29 +0000)]
Merge "Use rotation from MediaMetadataRetriever directly" into oc-mr1-dev
am:
106aeb324d
Change-Id: I5d7bbd0a3fb5f291f79a2e9009319eb4e57848a4
TreeHugger Robot [Fri, 6 Oct 2017 05:20:14 +0000 (05:20 +0000)]
Merge "Use rotation from MediaMetadataRetriever directly" into oc-mr1-dev
Erik Kline [Fri, 6 Oct 2017 03:56:55 +0000 (12:56 +0900)]
Log NAT update descriptions when receiving netlink errors
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- new logging messages observed
2017-10-06T13:15:25.190 - [OffloadController] ERROR Error updating NAT conntrack entry >TCP (192.168.43.222, 58054) -> (198.35.26.112, 443)<: android.system.ErrnoException: NetlinkErrorMessage{...
Bug:
29337859
Bug:
32163131
Bug:
64976634
Bug:
67396342
Change-Id: Ie05d4e6588d75f8a9798f40b68a317e24b3b5050
Brad Ebinger [Fri, 6 Oct 2017 04:12:31 +0000 (04:12 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call" am:
b7dc3a3b21 am:
4910739237
am:
5b2afc8dab
Change-Id: Id8ca403a839cff994970c370973a91e8e5688722
Brad Ebinger [Fri, 6 Oct 2017 04:03:51 +0000 (04:03 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call" am:
b7dc3a3b21
am:
4910739237
Change-Id: I7a0be565cebff2f87b136a6c29484ee43ca116ab
Brad Ebinger [Fri, 6 Oct 2017 03:54:29 +0000 (03:54 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call"
am:
b7dc3a3b21
Change-Id: I16555b53bbf9c743921cbd36578af3550705a242
Jordan Liu [Fri, 6 Oct 2017 03:47:47 +0000 (03:47 +0000)]
Merge "Display "No service" on status bar when SIM unready" am:
a666dbb628 -s ours am:
e59a45f3ae
am:
a71be8e2f1
Change-Id: Ie92544f03960bddbd04f9c6b7e018cb5f646e50f
Treehugger Robot [Fri, 6 Oct 2017 03:43:31 +0000 (03:43 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call"
Jordan Liu [Fri, 6 Oct 2017 03:35:53 +0000 (03:35 +0000)]
Merge "Display "No service" on status bar when SIM unready" am:
a666dbb628 -s ours
am:
e59a45f3ae
Change-Id: I76241cdf485b9b9e6193a22cf5748d8695ff8d23
Jordan Liu [Fri, 6 Oct 2017 03:25:25 +0000 (03:25 +0000)]
Merge "Display "No service" on status bar when SIM unready"
am:
a666dbb628 -s ours
Change-Id: I7f0987c397206fcd3becf16e5d867bf57d2fc528
gopinath [Fri, 6 Oct 2017 01:09:43 +0000 (01:09 +0000)]
Avoid spaces in the trace file names.
am:
bb3ff15495
Change-Id: Id9c8733c21f9aaee286519e45647c57067cc5b1b
Mike Ma [Tue, 19 Sep 2017 23:06:03 +0000 (16:06 -0700)]
Add AOD metrics in batterystats
Fixes:
64899521
Test: manual - flash build, reset batteryStats, use device > 1 hr
with alternating pattern between screen on/off/AOD. Dump stats, check
all screen related stats look normal, esp. record matches actual time
spent in each screen state. In raw bugreport:
Search "amount discharged" for % discharge;
Search "Screen on/off/doze discharge" for mAh discharge;
Search "time on battery" for up/real time in each state.
Test: Added two unit tests for note AOD screen state
Merged-In: I7193a36751124dd380818b2b665303c0f0d8c984
Change-Id: I51cead7f92abd9e4c620f7dfde393993cdad494e
Tobias Thierer [Thu, 5 Oct 2017 23:38:06 +0000 (23:38 +0000)]
Merge "Fix documentation generation with OpenJDK 9 javadoc." am:
ed6ae8f2b1 am:
8d4e36b1e8
am:
7c8e38c2cc
Change-Id: Idf7ff7b214281982a4a747c1e0af4cf54f622865
Jordan Liu [Thu, 5 Oct 2017 23:30:45 +0000 (23:30 +0000)]
Merge "Display "No service" on status bar when SIM unready"
Tobias Thierer [Thu, 5 Oct 2017 23:21:40 +0000 (23:21 +0000)]
Merge "Fix documentation generation with OpenJDK 9 javadoc." am:
ed6ae8f2b1
am:
8d4e36b1e8
Change-Id: Iba6de5e888f7de9835199eda278c46f6b3c261d8
Tobias Thierer [Thu, 5 Oct 2017 23:12:37 +0000 (23:12 +0000)]
Merge "Fix documentation generation with OpenJDK 9 javadoc."
am:
ed6ae8f2b1
Change-Id: I8bd1f9b3994f480d55d7c885b2c24227a67915e9
Tobias Thierer [Thu, 5 Oct 2017 23:01:03 +0000 (23:01 +0000)]
Merge "Fix documentation generation with OpenJDK 9 javadoc."
gopinath [Sat, 16 Sep 2017 01:09:02 +0000 (18:09 -0700)]
Avoid spaces in the trace file names.
Having spaces in the trace file names introduces slashes in the
file names and not able to pull the file names with the slashes
from the device.So avoid having spaces while constructing the
trace file names.
Bug : b/
65737738
Change-Id: Ie1971566586f77d18b17722ce0e3cc9ef3ebfdd3
(cherry picked from commit
3f04fb1bcf168e5ea8aae090f86b9122189c6390)
Chong Zhang [Thu, 5 Oct 2017 22:12:36 +0000 (15:12 -0700)]
Use rotation from MediaMetadataRetriever directly
MediaMetadataRetriever now reports rotation in clockwise,
no longer need to translate.
bug:
67470228
Test: verified rotation using test app attached in bug
Change-Id: Ifebcf25ea302477818e2e03db1e55525db985e67
Ruben Brunk [Thu, 5 Oct 2017 20:55:37 +0000 (20:55 +0000)]
Fix NPE in dumpsys logs.
am:
b844956d69
Change-Id: I4c1c5f03ddfee30cc602a76d15e31267ed4e1b1f
Ruben Brunk [Thu, 5 Oct 2017 20:30:47 +0000 (13:30 -0700)]
Fix NPE in dumpsys logs.
Bug:
67460310
Bug:
66967700
Test: adb shell dumpsys vrmanager
Change-Id: I008717663dd5ae4fe99ca62f631794a56ca2eb12
Brad Ebinger [Thu, 5 Oct 2017 18:39:06 +0000 (11:39 -0700)]
Fix NPE when removing PIN locked SIM during E911 call
There is the possibility of mCallback being null while
the Keyguard still has a PhoneStateListener registered
for onSimStateChanged callback. This can cause a NPE.
Bug:
66986066
Test: Manual, PIN/PUK locked SIM
Change-Id: I799c9521f787e800e259c3bdce9edee3f844f5f3
Ruben Brunk [Thu, 5 Oct 2017 14:27:12 +0000 (14:27 +0000)]
Change recovery logic for services bound by VrManagerService.
am:
d675f51c72
Change-Id: I58ffdf20a027baa648129f61f484d76511290435
Ruben Brunk [Tue, 3 Oct 2017 22:39:41 +0000 (15:39 -0700)]
Change recovery logic for services bound by VrManagerService.
- On AIO VR devices (where live VR services are required to render
anything), reconnect to the VrListenerService and VR compositor service
indefinitely and never leave VR + persistent mode.
- On smartphone VR devices, do not reconnect if the VrListenerService
dies for any reason, instead immediately leave VR + persistent mode. If
the VR compositor dies, reconnect a limited number of times. The
expectation is that the VrListenerService process will detect the
compositor crashes separately (via a shared service binding), and chose
to either attempt to fall back to a previous render path or simply
propagate the crash and leave VR mode entirely.
- Update dumpsys logging to include lifecycle events from the
VrListenerService and VR compositor service.
Bug:
66967700
Test: Manual test with VrCore APK by logging when the VR services are
connected and killing each VrCore process from ADB shell.
e.g.:
- Repeatedly kill the VrCore main process.
- Repeatedly kill the VrCore compositor process.
- Repeatedly kill both processes.
Change-Id: I8952b872b39102a601f66bc6624fc0ad92ca0f30
dimitry [Thu, 5 Oct 2017 10:21:59 +0000 (10:21 +0000)]
Merge "NativeActivity: Improve error message reporting" am:
de3150db1e am:
7de4dd6e07
am:
ef85667803
Change-Id: I03af96d3c6f3e188841ea5015de805d88038975b
dimitry [Thu, 5 Oct 2017 10:04:12 +0000 (10:04 +0000)]
Merge "NativeActivity: Improve error message reporting" am:
de3150db1e
am:
7de4dd6e07
Change-Id: Ifb7d744bade56fd723567cc774a2849b03cbdeb4
dimitry [Thu, 5 Oct 2017 09:53:27 +0000 (09:53 +0000)]
Merge "NativeActivity: Improve error message reporting"
am:
de3150db1e
Change-Id: Icdce5b900d87e136a398f6c68c4706b53dcdcec0
Treehugger Robot [Thu, 5 Oct 2017 09:44:21 +0000 (09:44 +0000)]
Merge "NativeActivity: Improve error message reporting"
Ruben Brunk [Thu, 5 Oct 2017 04:03:03 +0000 (04:03 +0000)]
Merge "Bind VR compositor service from VrManagerService." into oc-mr1-dev
am:
c765c2c448
Change-Id: I868d30cae1181efc90d41d3a2fea33baa503ff0a
TreeHugger Robot [Thu, 5 Oct 2017 03:53:44 +0000 (03:53 +0000)]
Merge "Bind VR compositor service from VrManagerService." into oc-mr1-dev
Jeremy Joslin [Thu, 5 Oct 2017 01:18:57 +0000 (01:18 +0000)]
Merge "Add isOpenNetwork() to WifiConfiguration." into oc-mr1-dev
am:
3ea0acac69
Change-Id: Ia64bcf53c94eca8245e581b36318064d73a57bb6
Android Build Merger (Role) [Thu, 5 Oct 2017 01:10:24 +0000 (01:10 +0000)]
Merge "Merge "Cosmetic Cleanups for IpSecService" am:
5ade9a228d am:
0bdb9a6e00 am:
cc51ef0a47" into oc-mr1-dev-plus-aosp
nharold [Thu, 5 Oct 2017 01:07:53 +0000 (01:07 +0000)]
Merge "Cosmetic Cleanups for IpSecService" am:
5ade9a228d am:
0bdb9a6e00
am:
cc51ef0a47
Change-Id: I0a9c52ca26ad1b7e4505f7c9dc32ad9550b62afc
Karthik Ravi Shankar [Thu, 5 Oct 2017 01:06:30 +0000 (01:06 +0000)]
Merge "Fix race condition when entering low persistence mode" into oc-mr1-dev
am:
d947ff602e
Change-Id: I821158f29b35e960e8c73c4ca3d14ab3b9c1db66
TreeHugger Robot [Thu, 5 Oct 2017 01:05:55 +0000 (01:05 +0000)]
Merge "Add isOpenNetwork() to WifiConfiguration." into oc-mr1-dev
nharold [Thu, 5 Oct 2017 00:55:38 +0000 (00:55 +0000)]
Merge "Cosmetic Cleanups for IpSecService" am:
5ade9a228d
am:
0bdb9a6e00
Change-Id: Iac3aa05b4de68b818fe840c2ade4aa600fe29622
TreeHugger Robot [Thu, 5 Oct 2017 00:51:50 +0000 (00:51 +0000)]
Merge "Fix race condition when entering low persistence mode" into oc-mr1-dev
Matthew Ng [Thu, 5 Oct 2017 00:51:33 +0000 (00:51 +0000)]
Merge "Hides the statusbar in recents for low ram devices" into oc-mr1-dev
am:
eb7aba16d2
Change-Id: I73c29391eebb8df44c9ae40c00a594e4a0cd5580
nharold [Thu, 5 Oct 2017 00:44:37 +0000 (00:44 +0000)]
Merge "Cosmetic Cleanups for IpSecService"
am:
5ade9a228d
Change-Id: If47968dbd55f8f38f9e8dda4d78a0e2e41827da8
Guliz Tuncay [Thu, 5 Oct 2017 00:34:52 +0000 (00:34 +0000)]
Merge "Update Settings properly when no Spell Checker is available." into oc-mr1-dev
am:
406d5dfb12
Change-Id: Ie4eb7ae96307ac8e746f2b24b3e7a926526e1be5
TreeHugger Robot [Thu, 5 Oct 2017 00:34:02 +0000 (00:34 +0000)]
Merge "Hides the statusbar in recents for low ram devices" into oc-mr1-dev
Calin Juravle [Thu, 5 Oct 2017 00:25:11 +0000 (00:25 +0000)]
Merge "[framework] Compile secondary dex files in isolation" into oc-mr1-dev
am:
446e8babd6
Change-Id: I341efd5d36021b29a84fed72a715c6babb324e68
nharold [Thu, 5 Oct 2017 00:14:16 +0000 (00:14 +0000)]
Merge "Cosmetic Cleanups for IpSecService"
TreeHugger Robot [Thu, 5 Oct 2017 00:08:53 +0000 (00:08 +0000)]
Merge "Update Settings properly when no Spell Checker is available." into oc-mr1-dev
Adam Lesinski [Thu, 5 Oct 2017 00:08:33 +0000 (00:08 +0000)]
Merge "Finalize resource IDs for O-MR1" into oc-mr1-dev
am:
eb74a38bb8
Change-Id: I38e5a43144de5d5a49de29ab5ec4f9b8cfa103f0
Calin Juravle [Wed, 4 Oct 2017 23:59:10 +0000 (23:59 +0000)]
Merge "[framework] Compile secondary dex files in isolation" into oc-mr1-dev
Robert Carr [Wed, 4 Oct 2017 23:50:24 +0000 (23:50 +0000)]
Merge "Disable seamless-rotation when other windows are visible." into oc-mr1-dev
am:
59c258d83b
Change-Id: I663dd7a4dda53af850604c657dd54368310798ba
TreeHugger Robot [Wed, 4 Oct 2017 23:48:04 +0000 (23:48 +0000)]
Merge "Finalize resource IDs for O-MR1" into oc-mr1-dev
TreeHugger Robot [Wed, 4 Oct 2017 23:35:51 +0000 (23:35 +0000)]
Merge "Disable seamless-rotation when other windows are visible." into oc-mr1-dev
Felipe Leme [Wed, 4 Oct 2017 22:25:18 +0000 (22:25 +0000)]
Merge "Sets AutofillClient on attachBaseContext()" into oc-mr1-dev
am:
6d17d9d0cf
Change-Id: I4b1d2a4e308a91d15282ae99ee158b7004b91211
Karthik Ravi Shankar [Wed, 4 Oct 2017 20:30:13 +0000 (13:30 -0700)]
Fix race condition when entering low persistence mode
The problem is that -
1) When the device enters a VR activity directly from screen off, there
is a chance the device is not in low persistence mode and ghosting is
really bad.
2) LocalDisplayAdapter gets to know that the device is in VR mode later
than PowerManagerService due to scheduling of it's runnable.
3) The call to Lights HAL to change the display mode only is made only
when there is a brightness change.
4) This opens up a race condition where the PowerManagerService knows device
is in VR mode and changes the brightness to VR brightness before the
LocalDisplayAdapter knows about the VR mode change.
5) Since there is no more brightness change to be done, the device is
not in low persistence mode creating really bad UX.
Fix is to trigger a brightness change call when there is a Display state
change so that LocalDisplayAdapter sets the low persistence mode
correctly always.
Bug:
67114120
Test:
1) Lock and unlock to VR puts the device in low persistence mode
correctly always.
2) Lock and unlock in normal mode changes brightness correctly.
3) Even with lockscreen, all of the use cases above work correctly.
Change-Id: Ic0e6d92ba145aaa94f86e6d53ab5aa08cbbae10c
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>
TreeHugger Robot [Wed, 4 Oct 2017 22:17:11 +0000 (22:17 +0000)]
Merge "Sets AutofillClient on attachBaseContext()" into oc-mr1-dev
Matthew Ng [Wed, 4 Oct 2017 21:18:30 +0000 (14:18 -0700)]
Hides the statusbar in recents for low ram devices
When entering recents on a low ram device, the system will hide the
statusbar to match the spec (go/android-go-recents).
Test: manual - enter recents
Bug:
67346921
Change-Id: I180899560aa1379b0a68cf63ae9b780fdef1746d
Brad Ebinger [Wed, 4 Oct 2017 22:04:27 +0000 (22:04 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback" into oc-mr1-dev
am:
dbe2815199 -s ours
Change-Id: I0d1a9f811d3a35dacbc7c8527948da7ab5bde6c2
Brad Ebinger [Wed, 4 Oct 2017 21:54:12 +0000 (21:54 +0000)]
Adds a filtering bitmask to DownloadStateCallback
am:
dec9fda324 -s ours
Change-Id: I44e41907f229447dc53eb6fd19c7c6c8fd5bc95e
Brad Ebinger [Wed, 4 Oct 2017 21:42:33 +0000 (21:42 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback" into oc-mr1-dev
Robert Carr [Mon, 2 Oct 2017 20:00:55 +0000 (13:00 -0700)]
Disable seamless-rotation when other windows are visible.
Was never supported but has gotten more horrific for whatever reason.
Bug:
65612427
Change-Id: I25758f40876c76a6daaf6330ed7cfa84c759fc0f
Adam Lesinski [Wed, 4 Oct 2017 21:02:24 +0000 (14:02 -0700)]
Finalize resource IDs for O-MR1
Bug:
65543844
Test: manual
Merged-In: Ic1fd1278373a5f7486e214d3f7f4c13515edb9f9
Change-Id: Ic1fd1278373a5f7486e214d3f7f4c13515edb9f9
Calin Juravle [Wed, 4 Oct 2017 17:53:09 +0000 (10:53 -0700)]
[framework] Compile secondary dex files in isolation
The class loader context adds the overhead of extracting in-memory and
possibly extra verification which is being frowned upon when the loading
happens on the UI thread. Revert the correct fix of compiling secondary
dex files with their loading context until b/
64530081 is done.
Partial revert of commit
f1ff36f0f99ebb41d0c7e0f3248506a56998fa3f.
Test: adb shell cmd package compile -m quicken -f --secondary-dex
com.google.android.gms
Bug:
64530081
Bug:
66984396
Change-Id: Ib2815ce67b224883fe95c28d1424103e56342c6e
nharold [Wed, 4 Oct 2017 20:53:04 +0000 (20:53 +0000)]
Merge changes from topic "ipsec-svc-cleanup" am:
9778c7884f am:
ae61e0c6e8
am:
4e793fd0b5
Change-Id: Ib7eae5c9e223493281524e862979e16d25984dde
nharold [Wed, 4 Oct 2017 20:35:20 +0000 (20:35 +0000)]
Merge changes from topic "ipsec-svc-cleanup" am:
9778c7884f
am:
ae61e0c6e8
Change-Id: If8803e2fc98adb2f08a5bf2944fc60d0f0e71acd
Felipe Leme [Wed, 4 Oct 2017 20:25:42 +0000 (20:25 +0000)]
Merge "Improved javadocs for Autofill save workflow." into oc-mr1-dev
am:
94e07022c2
Change-Id: Iccafb0ef26a19788e6bd1d46fb856eb66d8e6087
nharold [Wed, 4 Oct 2017 20:24:10 +0000 (20:24 +0000)]
Merge changes from topic "ipsec-svc-cleanup"
am:
9778c7884f
Change-Id: Ide81ae76bd05ba3a2cc7c06c072306d30a489057
Brad Ebinger [Wed, 4 Oct 2017 20:12:36 +0000 (20:12 +0000)]
Merge "Remove verification for DownloadReceiver when failure" into oc-mr1-dev
am:
bd8d517381 -s ours
Change-Id: I11bbe95905e1324933ff4d439e4b2539a60e764f
Nathan Harold [Wed, 4 Oct 2017 19:58:55 +0000 (12:58 -0700)]
Cosmetic Cleanups for IpSecService
This is a follow-up CL to address comments
on aosp/466677
-Rename ManagedResourceArray.get()
-Comment cleanup
Bug:
38397094
Test: runtest frameworks-net
Change-Id: I6fbdd89c4a864fe1d8a19c68947f582d7b1f0f21
TreeHugger Robot [Wed, 4 Oct 2017 20:02:19 +0000 (20:02 +0000)]
Merge "Improved javadocs for Autofill save workflow." into oc-mr1-dev
nharold [Wed, 4 Oct 2017 20:00:52 +0000 (20:00 +0000)]
Merge changes from topic "ipsec-svc-cleanup"
* changes:
Split IpSecServiceTest to add IPv6 Tests
Add equals() for IpSecAlgorithm and IpSecConfig
Input Validation for IpSecService
Brad Ebinger [Wed, 4 Oct 2017 19:55:34 +0000 (19:55 +0000)]
Merge "Remove verification for DownloadReceiver when failure" into oc-mr1-dev
Yohei Yukawa [Wed, 4 Oct 2017 19:54:58 +0000 (19:54 +0000)]
Merge "Select only preinstalled Spell Checker Services" into oc-mr1-dev
am:
f93ca9fb89
Change-Id: I22482b8cda7a4ef2aad231f8ee4482b4a9aded9d
Yohei Yukawa [Wed, 4 Oct 2017 19:39:53 +0000 (19:39 +0000)]
Merge "Select only preinstalled Spell Checker Services" into oc-mr1-dev
Felipe Leme [Wed, 4 Oct 2017 16:56:21 +0000 (09:56 -0700)]
Sets AutofillClient on attachBaseContext()
When an activity overrides attachBaseContext(), the attached context must share
the same AutofillCient, otherwise it will break autofill in the activity.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.AttachedContextActivityTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Fixes:
67350639
Change-Id: I6b0c4c2fab5fa68eb6ee0714e107ca0816efb2cb
Brad Ebinger [Wed, 4 Oct 2017 18:58:09 +0000 (18:58 +0000)]
Merge "Decouple Content Name Locale from Content Language Locale" into oc-mr1-dev
am:
ea2c75f5ff -s ours
Change-Id: I07337343468beab7c24d78624d1e84d2534c3ecd
Jean-Michel Trivi [Wed, 4 Oct 2017 18:48:00 +0000 (18:48 +0000)]
Merge "AudioService: log ducking and incall muting of audio players" into oc-mr1-dev
am:
df3e2be715
Change-Id: I48361e2466fdaa723ec6f90ef6e3efd2d3761583
Brad Ebinger [Wed, 4 Oct 2017 18:35:12 +0000 (18:35 +0000)]
Merge "Decouple Content Name Locale from Content Language Locale" into oc-mr1-dev
Jean-Michel Trivi [Wed, 4 Oct 2017 18:33:42 +0000 (18:33 +0000)]
Merge "AudioService: log ducking and incall muting of audio players" into oc-mr1-dev
Jack He [Wed, 4 Oct 2017 18:09:50 +0000 (18:09 +0000)]
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent" am:
cfe51aabd2 am:
8057ba832e
am:
5dfce858ea
Change-Id: Ia3112971eb20c04325dd04bc76078195cec99a5f
dimitry [Wed, 4 Oct 2017 17:44:56 +0000 (19:44 +0200)]
NativeActivity: Improve error message reporting
The error message is not necessary a dlerror(). For the devices with
native bridge it is reported by NB implementation.
Bug: http://b/
67412560
Test: manual
Change-Id: I05377c3490199c40419831b5aae27cb30d4a321b
Jack He [Wed, 4 Oct 2017 17:42:26 +0000 (17:42 +0000)]
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent" am:
cfe51aabd2
am:
8057ba832e
Change-Id: I946cce466bb5e048ad7b19cd97caa466dab27a52
Brad Ebinger [Fri, 29 Sep 2017 22:12:08 +0000 (15:12 -0700)]
Adds a filtering bitmask to DownloadStateCallback
Adds the ability for an EMBMS app to specify a filtering
bitmask to DownloadStateCallback, which is used to filter
out callbacks that the EMBMS app doesn't need to listen
to.
Test: Testapps
Bug:
67112896
Merged-In: Iab96a457f45f759267b9a5a41df533c9988ede94
Change-Id: Id7f26ba3c3606c644b0ca3376df1107f5834facb
Jack He [Wed, 4 Oct 2017 17:22:28 +0000 (17:22 +0000)]
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent"
am:
cfe51aabd2
Change-Id: I6e2337a0b0f4722b82a91c53c340618b9277f3f6
Jeremy Joslin [Tue, 3 Oct 2017 19:25:43 +0000 (12:25 -0700)]
Add isOpenNetwork() to WifiConfiguration.
Bug:
65639900
Test: ./frameworks/base/wifi/tests/runtests.sh
Change-Id: I6ebd09b348473f9aa0394de289fd77f279e878a8
Treehugger Robot [Wed, 4 Oct 2017 17:01:00 +0000 (17:01 +0000)]
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent"
Guliz Tuncay [Thu, 17 Aug 2017 22:25:38 +0000 (15:25 -0700)]
Update Settings properly when no Spell Checker is available.
Currently, Settings is not being updated properly when the current spell
checker service is removed or disabled and there is no other spell
checker service available. The correct behavior is that Secure.Settings
should be updated with empty string to indicate there is no selected
spell checker service.
Bug:
64812014
Fixes:
67412078
Test: Manually as follows:
0. Make sure AOSP keyboard is installed.
1. adb shell settings put --user 0 secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
2. tapas SampleSpellCheckerService
3. make -j
4. adb install --user 0 -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
5. adb shell pm disable com.android.inputmethod.latin
6. adb shell settings get --user 0 secure selected_spell_checker
-> com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
7. adb uninstall com.example.android.samplespellcheckerservice
8. adb shell settings get --user 0 secure selected_spell_checker
-> empty
9. adb root
10. adb shell settings get --user 0 secure selected_spell_checker
-> empty
11. adb shell pm enable com.android.inputmethod.latin
12. adb shell settings get --user 0 secure selected_spell_checker
Change-Id: I30902a3d94f2ddef33f4a8067799e98322ae3a03
Merged-In: I30902a3d94f2ddef33f4a8067799e98322ae3a03
(manual cherrypick of
83a7330bbe8ee1e8fcaa88ba2fb5e4cb3154c790)
Jack He [Tue, 3 Oct 2017 02:08:30 +0000 (19:08 -0700)]
PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent
* Use ACTION_CONNECTION_STATE_CHANGED to broadcast connection state
change to comply with BluetoothProfile interface requirement
* Use BluetoothProfile.STATE_* variables to represent connection
states for PBAP profile
Bug:
63873163
Test: Connect to car kits
Change-Id: I7dfcfc1b3a3e4868ea5e313f62ad5e504d58b9c2
Guliz Tuncay [Wed, 16 Aug 2017 19:02:31 +0000 (12:02 -0700)]
Select only preinstalled Spell Checker Services
When we are setting a new spell checker as the default one in
Secure.Settings, TSMS#findAvailSpellCheckerLocked can pick up
any available spell checker service. This violates the principle
that user should be warned whenever we are setting an untrusted
spell checker service as the default service, since the warning
dialog is never shown.
Bug:
64764051
Fixes:
67410643
Test: Manually as follows:
0. Make sure AOSP keyboard is pre-installed.
1. adb shell settings put --user 0 secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
2. tapas SampleSpellCheckerService
3. make -j
4. adb install --user 0 -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
5. adb shell pm disable com.android.inputmethod.latin
6. adb shell settings get --user 0 secure selected_spell_checker
-> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
7. adb reboot
8. adb shell settings get --user 0 secure selected_spell_checker
-> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
Change-Id: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e
Merged-In: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e
(manual cherrypick of
0f0a37ba7def8db2c3e0ff1d7d8a30360e889f3f)
Eric Laurent [Wed, 4 Oct 2017 14:56:26 +0000 (14:56 +0000)]
Merge "Fix Cell broadcast sound in total silence" into oc-mr1-dev
am:
77ee4f2ff2
Change-Id: Ib39341f455b82750ef357dbf41d8815fb303844d
Eric Laurent [Wed, 4 Oct 2017 14:45:01 +0000 (14:45 +0000)]
Merge "Fix Cell broadcast sound in total silence" into oc-mr1-dev
Ben Schwartz [Wed, 4 Oct 2017 13:18:58 +0000 (13:18 +0000)]
Merge "New function signature for setResolverConfiguration" am:
8052930f4f am:
12318b5b4e
am:
2cc6819ebf
Change-Id: I10c492c5512b79b6a127d9dd3cae8ccf380001fb
Ben Schwartz [Wed, 4 Oct 2017 13:04:43 +0000 (13:04 +0000)]
Merge "New function signature for setResolverConfiguration" am:
8052930f4f
am:
12318b5b4e
Change-Id: I12d721a809646070900f81723a4d10f4635fec15
Ben Schwartz [Wed, 4 Oct 2017 12:54:14 +0000 (12:54 +0000)]
Merge "New function signature for setResolverConfiguration"
am:
8052930f4f
Change-Id: I1a2efbabc765dd1ff66316332cd69b221deff83b
Clara Bayarri [Wed, 4 Oct 2017 12:51:59 +0000 (12:51 +0000)]
Merge "Fix NPE in ActivityThread" into oc-mr1-dev
am:
348b13f597
Change-Id: I4ac05199b93902bb19fd6eb42563e9c4fa00ed6c
TreeHugger Robot [Wed, 4 Oct 2017 12:40:39 +0000 (12:40 +0000)]
Merge "Fix NPE in ActivityThread" into oc-mr1-dev
Treehugger Robot [Wed, 4 Oct 2017 12:39:09 +0000 (12:39 +0000)]
Merge "New function signature for setResolverConfiguration"
Sudheer Shanka [Wed, 4 Oct 2017 07:03:28 +0000 (07:03 +0000)]
Merge "Update NPMS to inform NMS of the changes in fw rules synchronously." into oc-mr1-dev
am:
7a349d7288
Change-Id: Ie01c1ba49bd72a4690d2f29689bc94f9fd793cb8
Chih-hung Hsieh [Wed, 4 Oct 2017 06:56:55 +0000 (06:56 +0000)]
Merge "Revert work around clang-tidy segmentation fault." am:
a47e513464 am:
e640a8284d
am:
5105505efd
Change-Id: I9c8bbe4322542d02dc43253b23ff7b0932488142
Chih-hung Hsieh [Wed, 4 Oct 2017 06:47:41 +0000 (06:47 +0000)]
Merge "Revert work around clang-tidy segmentation fault." am:
a47e513464
am:
e640a8284d
Change-Id: Ia52f1419e49016748e5651b192ef2eba19008d8d