Commit Graph

69551 Commits

Author SHA1 Message Date
Paul Duffin
621ebe692f Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" 2017-02-09 19:18:35 +00:00
Jeff Sharkey
78f2e38a12 DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself.  Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.

Test: builds, boots, send/recv MMS works in primary/secondary users
Bug: 33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
Merged-In: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit 7ff418d9a9)
2017-02-09 18:03:18 +00:00
Jeff Sharkey
d94624347f DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3eddf40675 am: 14b308de91
am: 473b52eb62

Change-Id: Ic9afb12547b271de6e423601131605b0d930e10b
2017-02-09 17:42:09 +00:00
Jeff Sharkey
19fd8e3f06 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3eddf40675
am: 14b308de91

Change-Id: I3ae65230058cd51b4efb06358dae35dce419c04b
2017-02-09 17:39:14 +00:00
Jeff Sharkey
473b52eb62 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3eddf40675
am: 14b308de91

Change-Id: I428dcaa5e44364d30a51392c224ad68a6e455e2b
2017-02-09 17:37:44 +00:00
Jeff Sharkey
14b308de91 DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am: 3eddf40675

Change-Id: Ied7f446ac2e539654b9f7d5e1ab7cce8aec7390e
2017-02-09 17:33:43 +00:00
Paul Duffin
57e490cf8c Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
This partially reverts commit 3e5fbca0c5.

Bug: 35187548
Bug: 30188076
Bug: 35089332
Test: make checkbuild
Change-Id: I7ab4279aab604e3d56003b0a59867948aebabd28
2017-02-09 14:52:43 +00:00
songjinshi
78a3d9dab4 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85 am: ec69bd0aa3
am: 36bcc913f7

Change-Id: Icf40ff98196d885e6974eb679532064b30bc68cd
2017-02-08 20:28:48 +00:00
songjinshi
36bcc913f7 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85
am: ec69bd0aa3

Change-Id: Idfe455733dd12bf82c31cb505681e4fa89d57bfb
2017-02-08 20:22:26 +00:00
Paul Duffin
c02f6bb64b Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a am: 9e99b9ee45
am: 9250814fd2

Change-Id: Ifd924bdb62102657bf0c6d4b07ab919cf0f96c0c
2017-02-08 20:18:34 +00:00
songjinshi
ec69bd0aa3 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
am: b6f7a85b85

Change-Id: Iea79127b2c7d823844406f677a98fea54043f4cb
2017-02-08 20:18:13 +00:00
Treehugger Robot
b6f7a85b85 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." 2017-02-08 20:11:23 +00:00
Paul Duffin
9250814fd2 Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a
am: 9e99b9ee45

Change-Id: I289950cff0cdc6b5ad301936c7b55eadee5fd0f8
2017-02-08 18:30:17 +00:00
Paul Duffin
9e99b9ee45 Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
am: 78a20be77a

Change-Id: I6f32dc27f70e4c22d25ec6bd2eec715700ebbd89
2017-02-08 18:14:50 +00:00
Paul Duffin
78a20be77a Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" 2017-02-08 18:06:08 +00:00
Paul Duffin
d0a937e84b Merge "Fix problem with JavaDoc" am: 8f33fcdc4b am: 4929aafc1d
am: 290274df0d

Change-Id: I4e9ef88d6aa6c69a35b6b995ebf0b90214aef79d
2017-02-08 11:39:15 +00:00
Paul Duffin
290274df0d Merge "Fix problem with JavaDoc" am: 8f33fcdc4b
am: 4929aafc1d

Change-Id: I08c9f20c34a2952105854d107b442884dba220b1
2017-02-08 11:35:19 +00:00
Paul Duffin
4929aafc1d Merge "Fix problem with JavaDoc"
am: 8f33fcdc4b

Change-Id: I25fd01b35a2c1299304401a1333f737ee9252317
2017-02-08 11:31:15 +00:00
Rubin Xu
ca53b27c34 Fix uri permission grant on remote bug report uri
System server is no longer allowed to grant uri permission directly. As a result
we use grantUriPermissionFromIntent() to grant permission from the shell UID,
who is the owner of the bug report content.

Also fix a security bug where the broadcast to notify user consent of remote
bug report mismatches the <protected-broadcast> definition, causing it to be
sendable by anyone.

Bug: 34159108
Test: manual - Install TestDPC and request bugreport, try accept and decline
      once the report is ready (Bullhead).

Merged-In: I66e3f2a16d4547549f09d3c96d52aed2330caedf
Change-Id: I66e3f2a16d4547549f09d3c96d52aed2330caedf
2017-02-08 10:15:48 +00:00
Paul Duffin
b5c09b5487 Fix problem with JavaDoc
Test: make checkbuild
Change-Id: Ia321e0a57ff63aa62adee16d611c063a22807176
2017-02-08 09:16:18 +00:00
Shreyas Basarge
faf365dd5e Fix requiresCharging false value ignored issue
am: e33c3c81af

Change-Id: Ia96915b00e274ed6c7c8fdaea46ee5a0ba83bdcb
2017-02-08 00:58:47 +00:00
Shreyas Basarge
f47b9cf1c1 Merge "Fix requiresCharging false value ignored issue" into nyc-mr2-dev 2017-02-08 00:49:59 +00:00
songjinshi
e02e3ea7f9 [Debug]: Add timeout for dumpNativeBacktraceToFile.
If the debuggerd be blocked, the watchdog and
activitymanager thread will be blocked when the
ANR or watchdog occurs,so we needed to add
timeout for dumpNativeBacktraceToFile.

Change-Id: Iab1a64328e70257025d860638d93a4fb8eaaeea2
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
2017-02-07 19:17:45 +00:00
Paul Duffin
3e5fbca0c5 Replace com.android.internal.util.Predicate with java.util.function.Predicate
Bug: 35089332
Bug: 30188076
Test: make checkbuild
Merged-In: I0a5b4bf520fc39b59d8d790b01e9cff0d54e6d21
Change-Id: I58e4e35e7b7315033d893748f7c79e1ba6732f39
2017-02-07 16:57:54 +00:00
Jeff Sharkey
a78841ebd4 DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself.  Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.

Test: builds, boots, send/recv MMS works in primary/secondary users
Bug: 33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit 7ff418d9a9)
2017-02-07 04:04:15 +00:00
Jeff Sharkey
3eddf40675 DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself.  Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.

Test: builds, boots, send/recv MMS works in primary/secondary users
Bug: 33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit 7ff418d9a9)
2017-02-07 01:23:32 +00:00
Charles He
9b734a7c4c Fingerprint: get auth id for non-current user.
am: aae60473e1

Change-Id: I547076caaa27d86d682addc14106a344a1b4cec9
2017-02-07 01:20:42 +00:00
Charles He
15b8313d1b Merge "Fingerprint: get auth id for non-current user." into nyc-mr2-dev 2017-02-07 01:15:24 +00:00
Charles He
aae60473e1 Fingerprint: get auth id for non-current user.
Previously, getAuthenticatorId() simply returns the authenticator id
corresponding to the currently active user in FingerprintService.
However, this can cause bugs when, for example, KeyStore calls the
method before storing a fingerprint-bound key for a non-current user. In
such cases, the authenticator id of the calling user is desired, which
is not necessarily the same as the "current user" in FingerprintService.
This CL ensures the FingerprintService always returns the authenticator
id of the calling user.

Bug: 33459191
Test: manual
Change-Id: Ia9d6b869d16bd37f45358ba839cd12901ebc1076
Merged-In: I35c5a3a7082cffb8941eeaa219c8e20948ad41a9
2017-02-07 01:02:51 +00:00
Pavlin Radoslavov
537eaf0f6e Merge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62 am: cd6e0ee19d
am: b7067e2b6c

Change-Id: I459480c5bf8e512340d95452c491e9e2986a84a8
2017-02-07 00:18:40 +00:00
Pavlin Radoslavov
b7067e2b6c Merge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62
am: cd6e0ee19d

Change-Id: I6fb8a3a35451cf2d1e228466ef4a4d4e89d1d4ca
2017-02-07 00:10:21 +00:00
Justin Klaassen
46d3d6d313 Remove experimental twilight-based automatic brightness
am: 614f40ea01

Change-Id: I1b0ec1645f38892adb894900b3b3725fc0b23452
2017-02-06 23:28:27 +00:00
TreeHugger Robot
1f56b60981 Merge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev 2017-02-06 23:21:04 +00:00
Pavlin Radoslavov
cd6e0ee19d Merge "Add a mechanism to configure the default A2DP codec priorities"
am: acf34d8b62

Change-Id: I8a97b344bb09f4bded076ea81875b3b78dc50bea
2017-02-06 23:12:23 +00:00
Ying Wai (Daniel) Fan
df6a737108 Prevent division-by-zero error when calculating battery capacity. am: 415f8b32e8
am: 63f3dbae3c

Change-Id: I1c97aa2e4c0bbc84c547e4ce3ff98b77c5bba3f4
2017-02-06 23:02:08 +00:00
Ying Wai (Daniel) Fan
b87f8900ce Prevent division-by-zero error when calculating battery capacity.
am: 415f8b32e8

Change-Id: Ie58c329fa0814111291922b9a669ca181d4a487f
2017-02-06 23:00:35 +00:00
Ying Wai (Daniel) Fan
63f3dbae3c Prevent division-by-zero error when calculating battery capacity.
am: 415f8b32e8

Change-Id: I1337db6391a9511df52560e8edb8a09260e27c5f
2017-02-06 22:57:23 +00:00
Aaron Whyte
50fa8ad424 Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev 2017-02-06 22:49:35 +00:00
Pavlin Radoslavov
2199339c39 Add a mechanism to configure the default A2DP codec priorities
Previously, the relative codec priorities were hard-codec internally.
The new mechanism uses the following configurable resources in
packages/apps/Bluetooth/res/values/config.xml to re-assign the
default codec priorities per device, or to explicitly disable a codec.

 - a2dp_source_codec_priority_sbc
 - a2dp_source_codec_priority_aac
 - a2dp_source_codec_priority_aptx
 - a2dp_source_codec_priority_aptx_hd
 - a2dp_source_codec_priority_ldac

Those values are assigned on startup.
Also, they can be changed per device by using an overlay:
device/<VENDOR>/<DEVICE>/overlay/packages/apps/Bluetooth/res/values/config.xml

Test: Manually streaming to a headset
Change-Id: Ic4da3a51ac73f00cbae731156cb7878c8fadee06
2017-02-06 13:07:23 -08:00
Shreyas Basarge
e33c3c81af Fix requiresCharging false value ignored issue
If a SyncRequest builder is used to create a sync
request and setRequiresCharging(bool) is used,
the sync request requires charging irrespective of
the boolean value provided. This cl fixes the issue.

Bug: 35027396

Test: Tested manually by looking for the charging bit in jobscheduler
dumpsys.

Change-Id: I8f642597a64b8964665f41f5ce9ca71529634069
(cherry picked from commit 3a147230a4)
2017-02-06 20:11:42 +00:00
Aga Madurska
65f351d923 Use correct APIs to detect conditions for round scrollbars. am: 99485ef841
am: 50bc6a1998

Change-Id: Iab07814fd54b35705a20088e29c78a56ea943eba
2017-02-06 19:40:50 +00:00
Aga Madurska
9e7a8688c1 Use correct APIs to detect conditions for round scrollbars.
am: 99485ef841

Change-Id: I8aaa6bf17e253f6178b96c6743ff7779d5f3b7ef
2017-02-06 19:37:04 +00:00
Aga Madurska
50bc6a1998 Use correct APIs to detect conditions for round scrollbars.
am: 99485ef841

Change-Id: I8301a27b03d1ba64e48064057f112ebaf38eb6c2
2017-02-06 19:37:00 +00:00
Agnieszka Madurska
16edc46ca3 Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev 2017-02-06 19:30:31 +00:00
Ying Wai (Daniel) Fan
415f8b32e8 Prevent division-by-zero error when calculating battery capacity.
Bug: 34255953
Change-Id: Ie072cd5dc26faf17e8ab46ea0795750396f087c2
Fixes: 34255953
Test: formula change CL. No existing unit tests found.
2017-02-06 18:20:40 +00:00
Pavel Grafov
c3beac34f6 Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31 am: fca679ff74
am: 5a474b4930

Change-Id: If1731db386157b1f53c3a7bbe379299c1ada0ca9
2017-02-06 17:52:37 +00:00
Pavel Grafov
5a474b4930 Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31
am: fca679ff74

Change-Id: Ic6e2aab590583c501fa74317ee614ab1ebaea378
2017-02-06 17:46:11 +00:00
Pavel Grafov
1bb00e0849 Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31
am: fca679ff74

Change-Id: I9f02c30450e56b8f25bbbe4b1baa2381c84437c8
2017-02-06 17:46:09 +00:00
Pavel Grafov
fca679ff74 Fix the documentation for SecurityLog.SecurityEvent.getData().
am: 739cda8f31

Change-Id: I0c6f1271392bfc9cc8d253d5fa5e029213492b48
2017-02-06 17:41:08 +00:00
Jason Monk
6e8c039e24 Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" am: ff1d8da55e am: 74a8b6543f
am: a8e10e5f20

Change-Id: I1585be50ecf4409f552b5ef5c91de1092a01e199
2017-02-06 15:52:04 +00:00