Commit Graph

277484 Commits

Author SHA1 Message Date
Bill Yi
f22cb06b4d Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-04 18:46:43 +00:00
Bill Yi
8217bdab27 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-10-04 18:45:20 +00:00
Bill Yi
eb82f86f97 Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: fc65231a36  -s ours

Change-Id: Ifbc89fe764b8b4f3531d0b4d838bcb7e689e86d4
2016-10-04 18:38:32 +00:00
Bill Yi
c923fb9dbd Import translations. DO NOT MERGE
am: 0e03f95cda  -s ours

Change-Id: I614a053a441b850174dfad7d404b97859c64fc89
2016-10-04 18:38:26 +00:00
Bill Yi
fc65231a36 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-10-04 18:35:11 +00:00
Jordan Liu
5ffaae6efe Merge "Add editable_voicemail_number key to CarrierConfig" am: 25b64aad01 am: 2b7118fcbf
am: c44e7f3f76

Change-Id: I208e7871029efc1ca331fac3b240d337d00d3189
2016-10-04 18:30:19 +00:00
Jordan Liu
7a99ecfa17 Merge "Remove config in frameworks/base" am: 529f8d7209 am: 32e1d7f6b4
am: 1c4c9c7690

Change-Id: I0c1436660146bcebc573671b4fbc0f95df25b4ab
2016-10-04 18:29:30 +00:00
Jordan Liu
c44e7f3f76 Merge "Add editable_voicemail_number key to CarrierConfig" am: 25b64aad01
am: 2b7118fcbf

Change-Id: I4ca39a58ed1d35eae4a0b8802c027cd0c4c271ee
2016-10-04 18:23:25 +00:00
Jordan Liu
1c4c9c7690 Merge "Remove config in frameworks/base" am: 529f8d7209
am: 32e1d7f6b4

Change-Id: I3016d18369640dfc7336106b2272f737113b133a
2016-10-04 18:22:27 +00:00
Jordan Liu
2b7118fcbf Merge "Add editable_voicemail_number key to CarrierConfig"
am: 25b64aad01

Change-Id: If3ac600a1dbb0dc0aba65af49d271b333b7e6368
2016-10-04 18:17:25 +00:00
Jordan Liu
32e1d7f6b4 Merge "Remove config in frameworks/base"
am: 529f8d7209

Change-Id: I20e8eef28b656fd60da84da00b9d9d566d3b340b
2016-10-04 18:16:30 +00:00
Jordan Liu
25b64aad01 Merge "Add editable_voicemail_number key to CarrierConfig" 2016-10-04 18:07:01 +00:00
Jordan Liu
529f8d7209 Merge "Remove config in frameworks/base" 2016-10-04 18:07:01 +00:00
Jakub Pawlowski
0278ab957a Fix connecting to profiles when bonding from local device (1/3)
When bond is created from Bluetooth Settings, profiles gets properly
auto connected when services are discovered. If pairing is done from any
other app, i.e. NFC app, the bond is not being recognized as initiated
from local device, and profiles are not connected.

This patch makes sure that if bonding is initiated, no matter from which
app, it will cause proper profiles to connect.

Bug: 30211618
Change-Id: I71131f33eb5b9db2f5b4a8737b191d541bf1fd3d
2016-10-04 17:29:37 +00:00
Peter Qiu
1e9dd72b64 wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates
Bug: 31834143
Test: frameworks/base/wifi/tests/runtest.sh

Change-Id: Ie013c0637e66fb970746ad8f80bca03515b72443
2016-10-04 10:18:50 -07:00
Peter Qiu
49f2684f31 wifi: add ParcelUtil for parcelizing non-parcelable objects
This CL adds the support for X509Certificate and PrivateKey objects.

Bug: 31834143
Test: frameworks/base/wifi/tests/runtest.sh

Change-Id: I1416a2aeeb0dfdd4a562d1a3b578addf55deb4ab
2016-10-04 10:18:44 -07:00
Jakub Adamek
278a3472dc Adding customizable background colour support.
am: eedebc4850

Change-Id: I0accdfc75b295bed8e8779d85bb8c48f47595cee
2016-10-04 10:14:30 +00:00
Jakub Adamek
426e7a0f83 Improving customization in DeviceDefault themes.
Changes standard button color to white with 50% alpha.
Fixes background color in radio lists in settings.
Continues in removing duplication of color palette.

Bug: 31391353

Change-Id: I3778c070644e85d50743d34af57103b1a2b636ba
2016-10-04 11:13:47 +01:00
Jorim Jaggi
a92006ef6c Merge "Reload state when user unlocks" into nyc-mr1-dev 2016-10-04 09:55:32 +00:00
Lorenzo Colitti
80f15e3b4c Merge changes from topic 'avoidbadwifi' into nyc-dr1-dev
am: 291af5c568

Change-Id: Idf4004f1cfb6b1b4c53d699f98faff5a55fc7b90
2016-10-04 07:50:20 +00:00
Lorenzo Colitti
d2ad8ece53 Ignore loss of IPv6 provisioning when not avoiding bad Wi-Fi.
am: f11ee9f592

Change-Id: I3090ac5fe7dabf2ee19120bd0ab566edaa95ddb6
2016-10-04 07:50:14 +00:00
Lorenzo Colitti
fdac9b608b Slightly simplify IpManager#compareProvisioning.
am: b77b775213

Change-Id: I31ab37d3fc39baf73fa14ef3b54b781b60347b41
2016-10-04 07:49:23 +00:00
Erik Kline
d719d95139 Conditionally accept loss of on-link IPv6 DNS servers
am: 5b437d6ff9

Change-Id: Ie32080d7918dea0ae89bd3e0987cb1c8f121e0bd
2016-10-04 07:48:46 +00:00
Erik Kline
23cdacbec6 Refactor "avoid bad wifi" logic into a utility class
am: 065ab6ee40

Change-Id: I4a6ad3791ac551b0d64b37dd4e2afef1e8e8ee10
2016-10-04 07:47:52 +00:00
Lorenzo Colitti
291af5c568 Merge changes from topic 'avoidbadwifi' into nyc-dr1-dev
* changes:
  Ignore loss of IPv6 provisioning when not avoiding bad Wi-Fi.
  Slightly simplify IpManager#compareProvisioning.
  Conditionally accept loss of on-link IPv6 DNS servers
  Refactor "avoid bad wifi" logic into a utility class
2016-10-04 07:42:09 +00:00
Lorenzo Colitti
f11ee9f592 Ignore loss of IPv6 provisioning when not avoiding bad Wi-Fi.
Bug: 31827713
Change-Id: I81471f2f3e6c1c4d7bdfebc9dd321bb9d76ad0b6
2016-10-04 15:07:44 +09:00
Lorenzo Colitti
b77b775213 Slightly simplify IpManager#compareProvisioning.
Bug: 31827713
Change-Id: Icc1c8d98feef14c972891451fd94f855d78de43e
2016-10-04 15:07:44 +09:00
Erik Kline
5b437d6ff9 Conditionally accept loss of on-link IPv6 DNS servers
Permit this if and only if we're not "avoiding bad wifi" in general.

Bug: 31827713
Change-Id: I0874ec2d1d09e913ccdbe9f6e178090400808a04
2016-10-04 15:07:43 +09:00
Erik Kline
065ab6ee40 Refactor "avoid bad wifi" logic into a utility class
Additionally, add this utility class to IpManager for compatibility
verification.  A follow-on CL will make use of IpManager's local
AvoidBadWifiTracker.

Bug: 31827713
Change-Id: If8c56c3f8076d6a5157ea180e361bbdadc2bc1dd
2016-10-04 15:07:42 +09:00
Dan Aminzade
f8d60b19ce Automatically grant location and body sensors permissions to
system packages that handle the com.android.fitness.TRACK
intent.

BUG: 31432884
Change-Id: I57ff470fe31ca6a3e824152b7b7eafd9759e3118
2016-10-04 04:14:17 +00:00
Bill Yi
cf2df3bb6e Import translations. DO NOT MERGE
Change-Id: I47285d5faa82286b22f8bc79198791225deb3923
Auto-generated-cl: translation import
2016-10-03 19:33:30 -07:00
Bill Yi
49baec862b Import translations. DO NOT MERGE
Change-Id: Ia2140f6189db3fbc9e00ea6bc3c33b8d2c90396e
Auto-generated-cl: translation import
2016-10-03 19:21:30 -07:00
Robert Carr
b14d4abc16 Prevent any rotation while seamless rotation is pending.
Various errors occur when using even the normal rotation animation while
seamless rotation is pending. So we just defer the rotation like we do
for the normal animation. Since we are doing this, we need to track
when seamless rotation finishes so we can perform a post-rotate
rotation if required.

Bug: 31749456
Change-Id: I99f189306c690ce868496460e9ca7dcc95e4ccdc
2016-10-03 19:14:35 -07:00
Robert Carr
45f6a2718a Prevent triggering orientation changes until previous completes.
Currently we defer rotation while the screen rotation animation
is animating, but there is an additional interval after the animation
completes where the display may not yet be unfrozen and attempting to
rotate again will not work.

Bug: 31749456
Change-Id: I5f6830d85fb326d5032b597cbed1b767f0b627f5
2016-10-03 18:51:37 -07:00
Wei Liu
898468657e Allow shell to acquire wakelock. DO NOT MERGE.
BUG: 31828706
BUG 30832947

Change-Id: I348ab5642ca625b4700ec63f72414729d574da5e
(cherry picked from commit 6e500010b1)
2016-10-03 17:43:22 -07:00
jackqdyulei
4bf191ca75 Add "FILTER_NOT_HIDE" to filter out the apps.
The "FILTER_NOT_HIDE" is used to filter out apps that "blacklisted"
by the carrier. So when user insert a specific sim card, these apps
disapper in settings > apps totally unless user enable them.

Bug: 31823872
Test: Manual
Change-Id: I62ec13806d70f68e6cd3cbd014e7513cda36358c
2016-10-03 17:14:28 -07:00
Dianne Hackborn
cb99a72e62 Fix issue #31305336: File corrupt: too many wake locks 101
The limit is MAX_WAKELOCKS_PER_UID+1, since OverflowArrayMap
will add one more to contain the overflow.

Change-Id: I53004582daa0c405427308816728f2c1d2bef40d
2016-10-03 17:00:02 -07:00
Wale Ogunwale
b3ec06630c Merge "Fix window animation flash issue" am: 1a02a26838 am: bb5f6db56a
am: 63993f20a4

Change-Id: I4b9d03bd48c6fb4a676c8ef3746fd757eb1f3943
2016-10-03 23:29:46 +00:00
Doris Liu
8d4c87b0bf Merge "Restrict AVD and VD parsing to the current element instead of the whole document" into nyc-mr1-dev 2016-10-03 23:28:54 +00:00
Wale Ogunwale
63993f20a4 Merge "Fix window animation flash issue" am: 1a02a26838
am: bb5f6db56a

Change-Id: Iea47c85999a4584ba878761710a175d925d0809a
2016-10-03 23:24:56 +00:00
Wale Ogunwale
bb5f6db56a Merge "Fix window animation flash issue"
am: 1a02a26838

Change-Id: Ib68ce77146e653b95cec215e4a80aaa0fb106ad2
2016-10-03 23:20:52 +00:00
Wale Ogunwale
1a02a26838 Merge "Fix window animation flash issue" 2016-10-03 23:14:34 +00:00
Tenghui Zhu
99224b311c Merge "Update JavaDoc about animatable on VectorDrawable" into nyc-mr1-dev 2016-10-03 22:53:45 +00:00
Adam Lesinski
68ec3695d0 Merge "Fix thread race caused double free issue." into nyc-mr1-dev 2016-10-03 21:36:49 +00:00
Doris Liu
1f859716a8 Restrict AVD and VD parsing to the current element instead of the whole document
This CL changes the AVD xml parsing to parsing only within the current
element, which prevents AVD parsing from always skipping to the end of
the doucment. So things that are defined after AVD in the same document
can be picked up by the xml parser.

The same fix has been applied to VD as well.

BUG: 31865175
Test: Manually following comment #1 in the bug above

Change-Id: I4ebdce1eb2e92d6f6e2c37caed9607253d24602f
2016-10-03 21:32:11 +00:00
Bill Yi
f39d5807a6 Import translations. DO NOT MERGE
Change-Id: I552e5efd2d7f2fd0324fc4d4693ee80847c43173
Auto-generated-cl: translation import
2016-10-03 14:27:54 -07:00
Bert McMeen
3264436d18 Docs: Wear preview 3 - tweaks to gradle snippet am: 70c6411a10
am: e617192fff

Change-Id: I08f517647976426a357a18e8f8ff44c52f1730ac
2016-10-03 21:22:07 +00:00
Bert McMeen
20cf00152d Docs: Wear preview 3 - tweaks to gradle snippet am: 70c6411a10
am: 19404c6f93

Change-Id: I05c3ee4ee575afc6214a44bbe4a5094287ce3c48
2016-10-03 21:21:20 +00:00
Bill Yi
0e03f95cda Import translations. DO NOT MERGE
Change-Id: I0526005174bb93a8e6ea419f47ba8f22e48890cf
Auto-generated-cl: translation import
2016-10-03 14:19:58 -07:00
Bert McMeen
e617192fff Docs: Wear preview 3 - tweaks to gradle snippet
am: 70c6411a10

Change-Id: Ia167f04b40f1edf2cf4b95d2e1b56b3efa6b8a75
2016-10-03 21:15:44 +00:00