OSDN Git Service
Jeremy Joslin [Thu, 5 Oct 2017 02:02:54 +0000 (02:02 +0000)]
Merge "Add isOpenNetwork() to WifiConfiguration." into oc-mr1-dev am:
3ea0acac69
am:
94197c1903
Change-Id: Iae7ffd343694da79fb7c7ab3e0c5434d6e730d5c
nharold [Thu, 5 Oct 2017 01:53:29 +0000 (01:53 +0000)]
Merge "Merge "Cosmetic Cleanups for IpSecService" am:
5ade9a228d am:
0bdb9a6e00 am:
cc51ef0a47" into oc-mr1-dev-plus-aosp
am:
7261ade5eb
Change-Id: I0624d4df68ba2bd6522da7e3ae14f13b7f2bfbc9
Karthik Ravi Shankar [Thu, 5 Oct 2017 01:39:58 +0000 (01:39 +0000)]
Merge "Fix race condition when entering low persistence mode" into oc-mr1-dev am:
d947ff602e
am:
e4159f4b0d
Change-Id: Id461281068fa437e96bbb0d1b3ab606a38f84b62
Matthew Ng [Thu, 5 Oct 2017 01:23:09 +0000 (01:23 +0000)]
Merge "Hides the statusbar in recents for low ram devices" into oc-mr1-dev am:
eb7aba16d2
am:
cc14e2bf3c
Change-Id: Ie2401daed37da53ea977b487a811a03522bf78d4
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
Guliz Tuncay [Thu, 5 Oct 2017 01:17:07 +0000 (01:17 +0000)]
Merge "Update Settings properly when no Spell Checker is available." into oc-mr1-dev am:
406d5dfb12
am:
9606c0e93d -s ours
Change-Id: I1d311359271af6928ff1b6a46f004f402b610988
TreeHugger Robot [Thu, 5 Oct 2017 01:11:35 +0000 (01:11 +0000)]
Merge "[RTT2] Remove Aware RTT code"
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
TreeHugger Robot [Thu, 5 Oct 2017 01:04:06 +0000 (01:04 +0000)]
Merge "Fix system server crash when told to init backup transports"
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
Calin Juravle [Thu, 5 Oct 2017 00:42:18 +0000 (00:42 +0000)]
Merge "[framework] Compile secondary dex files in isolation" into oc-mr1-dev am:
446e8babd6
am:
31ef7f3ab6
Change-Id: I547b7c8a1755b83811c09ad33aea6c5c2fe9b5aa
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
Evan Rosky [Thu, 5 Oct 2017 00:29:16 +0000 (00:29 +0000)]
Merge "Enable new initial-focus behavior for P"
Android Build Merger (Role) [Thu, 5 Oct 2017 00:26:08 +0000 (00:26 +0000)]
Merge "Merge "Finalize resource IDs for O-MR1" into oc-mr1-dev am:
eb74a38bb8 am:
e9a648282d -s ours"
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
Adam Lesinski [Thu, 5 Oct 2017 00:22:29 +0000 (00:22 +0000)]
Merge "Finalize resource IDs for O-MR1" into oc-mr1-dev am:
eb74a38bb8
am:
e9a648282d -s ours
Change-Id: I751292eb68c785c1c3fa05f5ba079ae99bd718a7
Adam Lesinski [Thu, 5 Oct 2017 00:21:56 +0000 (00:21 +0000)]
Merge "AAPT2: Move format related files under same directory"
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
Robert Carr [Thu, 5 Oct 2017 00:05:18 +0000 (00:05 +0000)]
Merge "Disable seamless-rotation when other windows are visible." into oc-mr1-dev am:
59c258d83b
am:
1d74b20513
Change-Id: If1b2315f1364913ddf1c7e9a9879cb9d92901474
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:39:18 +0000 (23:39 +0000)]
Merge "dumpsys shortcut can now dump specific users/packages."
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
TreeHugger Robot [Wed, 4 Oct 2017 23:24:43 +0000 (23:24 +0000)]
Merge "Fixing typos in ProtoOutputStream doccomment."
TreeHugger Robot [Wed, 4 Oct 2017 23:17:56 +0000 (23:17 +0000)]
Merge "Finalize resource IDs for O-MR1"
Christopher Tate [Wed, 4 Oct 2017 19:58:29 +0000 (12:58 -0700)]
Fix system server crash when told to init backup transports
Refactor + merge gone awry; and pay attention to typed vs typeless
use of toArray().
Change-Id: I031ded949a6e3f2a296c9bf007129e4ebf796a4b
Fix:
67419822
Test: adb root && adb wait-for-device && \
adb shell cmd activity broadcast -a android.app.backup.intent.INIT
TreeHugger Robot [Wed, 4 Oct 2017 22:56:32 +0000 (22:56 +0000)]
Merge "Add tests for line breaking that considers overhangs"
Felipe Leme [Wed, 4 Oct 2017 22:42:29 +0000 (22:42 +0000)]
Merge "Sets AutofillClient on attachBaseContext()" into oc-mr1-dev am:
6d17d9d0cf
am:
63b45a87d5
Change-Id: Ib7ae51cf0336c4cea8ff90d60995816d43b3fa36
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
Android Build Merger (Role) [Wed, 4 Oct 2017 22:21:47 +0000 (22:21 +0000)]
Merge "Merge "Adds a filtering bitmask to DownloadStateCallback" into oc-mr1-dev am:
dbe2815199 -s ours am:
bdfcee88f2 -s ours"
Yi Jin [Wed, 4 Oct 2017 22:20:48 +0000 (22:20 +0000)]
Merge "Remove number of Wake Kills, it is safe to change proto numbers since nothing is being used now."
Brad Ebinger [Wed, 4 Oct 2017 22:19:49 +0000 (22:19 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback" into oc-mr1-dev am:
dbe2815199 -s ours
am:
bdfcee88f2 -s ours
Change-Id: I09c0e83f640eb21c9d050118ccb022a0b0b569a0
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
Makoto Onuki [Wed, 4 Oct 2017 22:03:50 +0000 (15:03 -0700)]
dumpsys shortcut can now dump specific users/packages.
Test: manual
Change-Id: Iaf32ba17cd14fea61ab1ff1d4620b89f73538e81
Brad Ebinger [Wed, 4 Oct 2017 22:03:30 +0000 (22:03 +0000)]
Adds a filtering bitmask to DownloadStateCallback am:
dec9fda324 -s ours
am:
9413c4eb3f -s ours
Change-Id: I070c0806255af43927c17f3297c8304210a5dac4
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
Kweku Adams [Thu, 14 Sep 2017 19:04:25 +0000 (12:04 -0700)]
Fixing typos in ProtoOutputStream doccomment.
Updating comments to reference non-deprecated methods.
Test: none
Change-Id: I76194d7426e9a828eff629c6a680c064606babf0
Brad Ebinger [Wed, 4 Oct 2017 21:42:33 +0000 (21:42 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback" into oc-mr1-dev
Tor Norbye [Wed, 4 Oct 2017 21:37:02 +0000 (21:37 +0000)]
Merge "
67002586: Create @NavigationRes + Lint check"
Adam Lesinski [Fri, 29 Sep 2017 21:49:15 +0000 (14:49 -0700)]
AAPT2: Move format related files under same directory
Test: make aapt2_tests
Change-Id: Id72cdfc12ba3add294048e60c55f2461344464bf
nharold [Wed, 4 Oct 2017 21:14:17 +0000 (21:14 +0000)]
Merge changes from topic "ipsec-svc-cleanup" am:
9778c7884f am:
ae61e0c6e8 am:
4e793fd0b5
am:
b87c060ec7
Change-Id: I7418f23141b26f23555397d231e8a73692c04085
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
Roozbeh Pournader [Wed, 4 Oct 2017 00:09:43 +0000 (17:09 -0700)]
Add tests for line breaking that considers overhangs
This adds tests as well as a test font that has large overhangs for
some letters.
Bug:
63938206
Test: bit FrameworksCoreTests:android.text.LineBreakingOverhangsTest
Change-Id: I94c3c03419e525ec10b5158e476a94a9e319891d
Adam Lesinski [Wed, 4 Oct 2017 21:02:24 +0000 (14:02 -0700)]
Finalize resource IDs for O-MR1
Bug:
65543844
Test: manual
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
Felipe Leme [Wed, 4 Oct 2017 20:48:29 +0000 (20:48 +0000)]
Merge "Improved javadocs for Autofill save workflow." into oc-mr1-dev am:
94e07022c2
am:
d03db3c7f9
Change-Id: I29dee744197d18cf5085b8b7c23d2cdd29c1dc78
Android Build Merger (Role) [Wed, 4 Oct 2017 20:37:22 +0000 (20:37 +0000)]
Merge "Merge "Remove verification for DownloadReceiver when failure" into oc-mr1-dev am:
bd8d517381 -s ours am:
5d0acff53f -s ours"
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
Brad Ebinger [Wed, 4 Oct 2017 20:34:59 +0000 (20:34 +0000)]
Merge "Remove verification for DownloadReceiver when failure" into oc-mr1-dev am:
bd8d517381 -s ours
am:
5d0acff53f -s ours
Change-Id: I8558d49a3791264d3c133230cf9fd4b78cbedb34
Tony Mantler [Wed, 4 Oct 2017 20:30:37 +0000 (20:30 +0000)]
Merge "Move SerialNumberPreferenceController to SettingsLib"
Yohei Yukawa [Wed, 4 Oct 2017 20:27:17 +0000 (20:27 +0000)]
Merge "Select only preinstalled Spell Checker Services" into oc-mr1-dev am:
f93ca9fb89
am:
1b518584d3 -s ours
Change-Id: Ife3ea6d8ef0f7139d8ddc007f36a60209e2c8a4d
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
Fan Zhang [Wed, 4 Oct 2017 20:11:44 +0000 (20:11 +0000)]
Merge "Add helper method to override flag"
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
Wale Ogunwale [Wed, 4 Oct 2017 19:59:58 +0000 (19:59 +0000)]
Merge "Fix build breakage with ag/
2997247"
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
Wale Ogunwale [Wed, 4 Oct 2017 19:54:23 +0000 (12:54 -0700)]
Fix build breakage with ag/
2997247
Test: Builds
Bug:
65612427
Change-Id: Icacb44733a84a530dcea459209aac705ff837e22
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 19:16:49 +0000 (19:16 +0000)]
Merge "Decouple Content Name Locale from Content Language Locale" into oc-mr1-dev am:
ea2c75f5ff -s ours
am:
2a6df837a7 -s ours
Change-Id: I5092a0a25a99e025200a4cd826e25463f5baa967
Jean-Michel Trivi [Wed, 4 Oct 2017 18:58:27 +0000 (18:58 +0000)]
Merge "AudioService: log ducking and incall muting of audio players" into oc-mr1-dev am:
df3e2be715
am:
ed4a175643
Change-Id: I374331d9d6565116e13cb8929831cf7bc9e1261b
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
TreeHugger Robot [Wed, 4 Oct 2017 18:45:41 +0000 (18:45 +0000)]
Merge "Fix NPE in WebView relro creator process."
Android Build Merger (Role) [Wed, 4 Oct 2017 18:44:46 +0000 (18:44 +0000)]
Merge "Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent" am:
cfe51aabd2 am:
8057ba832e am:
5dfce858ea am:
1b41112e38"
Yueming Wang [Wed, 4 Oct 2017 18:37:21 +0000 (18:37 +0000)]
Merge "Add a new WipeData API that allows an input string for the reason to wipe user."
Jack He [Wed, 4 Oct 2017 18:36:48 +0000 (18:36 +0000)]
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent" am:
cfe51aabd2 am:
8057ba832e am:
5dfce858ea
am:
1b41112e38
Change-Id: I05a04fede6b724a5bffb34a062468e1158870132
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
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
Tony Mantler [Tue, 3 Oct 2017 22:46:20 +0000 (15:46 -0700)]
Move SerialNumberPreferenceController to SettingsLib
Bug:
67410808
Test: RunSettingsLibRoboTests
Change-Id: I6571934af7ff4015dad1e4400f52ab5b7bca0c5d
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"
Torne (Richard Coles) [Wed, 4 Oct 2017 15:29:58 +0000 (11:29 -0400)]
Fix NPE in WebView relro creator process.
There's no context available in the relro creator process, resulting in
a NPE and crash when it tries to see if WebView is supported. Skip the
check in this case, because we know it's supported if we ran the relro
creation process at all.
Change-Id: I95e9aad7407b8f73dddf8a8b685d41d2f500736a
Fixes:
67398770
Test: boot, make sure no crash dialog from "android"
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)