278079 Commits

Author SHA1 Message Date
Jeff Sharkey
ca44afff8a DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am: b9a0b79675 -s ours am: 1da786d723 am: af5f47caca am: ee8e0e8ae3 am: f70dd1fbc1 -s ours
am: 60f17b8505

Change-Id: I10b4a404deb98692a372df001b5af742f84f9d06
2016-12-02 01:28:44 +00:00
Jeff Sharkey
05318c125f Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev am: 32d2b4c7af -s ours
am: 18ade37c6b

Change-Id: I374cd53de7cc8e68b2605f2edc9cf595d1119c3e
2016-12-02 01:27:34 +00:00
Jeff Sharkey
2436f1e49d DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f084ccd48d -s ours
am: d9a7f11334

Change-Id: I8b47e258124e4be1b4067712a7cbabb9b7c82a8a
2016-12-02 01:26:32 +00:00
Jeff Sharkey
40b4b1f774 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3 am: 3e0d93036b am: 061e7313b4 am: 50102e63da -s ours
am: e94d76436b

Change-Id: Ice97dfb650bafe8fff720db26fcdc6f1db60037e
2016-12-02 01:25:28 +00:00
Jeff Sharkey
94a2dd9354 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: fbf395c220 am: 2d549764be am: b981c3be70 -s ours am: a24a33490a am: dd32a67b33
am: a898d9f6ca

Change-Id: Ia3add5aa2d68c32b293e82712d59dc439121fb01
2016-12-02 01:24:41 +00:00
Jeff Sharkey
cfa18212ff DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s ours am: 704085119d am: 8bd3aa70ad -s ours am: 60cc001b28 am: a0b41fca40
am: 793c3b14df

Change-Id: Ieb6c0ded58178120a8407efd023a190648db8c08
2016-12-02 01:24:37 +00:00
Jeff Sharkey
60f17b8505 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am: b9a0b79675 -s ours am: 1da786d723 am: af5f47caca am: ee8e0e8ae3
am: f70dd1fbc1  -s ours

Change-Id: Ie3be31b7010a3fae500b547fde31056084b3e2b7
2016-12-02 01:18:49 +00:00
Christine Hallstrom
4e22d6dc45 Add ability to set supported audio routes on phone accounts and connection
The set audio routes are used by Telecom to restrict where the audio may
be routed to. For example, an account can specify that calls may not be
routed over bluetooth headsets, which will prevent a new call from being
routed to this source.

This is a cherry-pick of abandoned ag/1521009.

Bug: 32958838
Change-Id: Idd5e4d38b157f11454f3d991385644f2f384596e
2016-12-01 17:18:35 -08:00
Jeff Sharkey
a898d9f6ca DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: fbf395c220 am: 2d549764be am: b981c3be70 -s ours am: a24a33490a
am: dd32a67b33

Change-Id: I2d8b2894d07f7f6173e979d7eb656e9ac860f06a
2016-12-02 01:18:32 +00:00
Jeff Sharkey
793c3b14df DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s ours am: 704085119d am: 8bd3aa70ad -s ours am: 60cc001b28
am: a0b41fca40

Change-Id: I12241d8c7c843c63981dfda795f99c8d18634d74
2016-12-02 01:18:27 +00:00
Jeff Sharkey
18ade37c6b Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev
am: 32d2b4c7af  -s ours

Change-Id: Id4cf3526f7892971e4f226e98036166cbe8d28ef
2016-12-02 01:14:27 +00:00
Jeff Sharkey
d9a7f11334 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: f084ccd48d  -s ours

Change-Id: I9b4630b18d52ad503b88380c1a853bf3c0b46a10
2016-12-02 01:14:23 +00:00
Jeff Sharkey
e94d76436b DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3 am: 3e0d93036b am: 061e7313b4
am: 50102e63da  -s ours

Change-Id: I3a587cb124b30ef5062600e7ba870da58213a094
2016-12-02 01:13:18 +00:00
Jeff Sharkey
f70dd1fbc1 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am: b9a0b79675 -s ours am: 1da786d723 am: af5f47caca
am: ee8e0e8ae3

Change-Id: I24fd90b2e61aabe95ccc5891c02fbbe2c795ba18
2016-12-02 01:13:13 +00:00
Jeff Sharkey
dd32a67b33 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: fbf395c220 am: 2d549764be am: b981c3be70 -s ours
am: a24a33490a

Change-Id: I8564b110d58f63aeee8afeab87773e97b7301a60
2016-12-02 01:13:09 +00:00
Jeff Sharkey
a0b41fca40 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s ours am: 704085119d am: 8bd3aa70ad -s ours
am: 60cc001b28

Change-Id: Ic21f6cc9072ae65ba67f117a21c4703e8f8cf6ea
2016-12-02 01:13:04 +00:00
TreeHugger Robot
32d2b4c7af Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev 2016-12-02 01:10:36 +00:00
Jeff Sharkey
a24a33490a DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: fbf395c220 am: 2d549764be
am: b981c3be70  -s ours

Change-Id: I22fe97ae93c6e665288d46c29429ca7690352fb3
2016-12-02 01:07:07 +00:00
Jeff Sharkey
ee8e0e8ae3 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am: b9a0b79675 -s ours am: 1da786d723
am: af5f47caca

Change-Id: Idc1de786eee9966a0d555affdb2ac41fa134eb55
2016-12-02 01:06:56 +00:00
Jeff Sharkey
50102e63da DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3 am: 3e0d93036b
am: 061e7313b4

Change-Id: If0723e8cb1484263a3b96b37d21132d2ebc9b1b5
2016-12-02 01:06:56 +00:00
Jeff Sharkey
60cc001b28 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s ours am: 704085119d
am: 8bd3aa70ad  -s ours

Change-Id: I3ef5d68391566fc428906799a6ec6d166b9479a4
2016-12-02 01:01:52 +00:00
Jeff Sharkey
af5f47caca DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am: b9a0b79675 -s ours
am: 1da786d723

Change-Id: I09b766396a8334551917723a47d5bba2590cb2bd
2016-12-02 01:01:51 +00:00
Jeff Sharkey
b981c3be70 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: fbf395c220
am: 2d549764be

Change-Id: Iad255e684d36524388a659181da0535bd15e37dc
2016-12-02 01:01:49 +00:00
Jeff Sharkey
061e7313b4 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3
am: 3e0d93036b

Change-Id: Ice0b80b96cdd7ad1a7691919982d98266a37f8bf
2016-12-02 01:01:49 +00:00
Jeff Sharkey
1da786d723 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2
am: b9a0b79675  -s ours

Change-Id: I82040d83bc780656b5deaa4fbe664700567e2138
2016-12-02 00:56:36 +00:00
Jeff Sharkey
8bd3aa70ad DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s ours
am: 704085119d

Change-Id: Ic687581a9bf5f0906cdb7642e59b81d9b6175aca
2016-12-02 00:56:32 +00:00
Jeff Sharkey
3e0d93036b DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: 3b0aa060a3

Change-Id: I3ba9a8dedfda4d878b99cc7de8a41418d424495c
2016-12-02 00:56:31 +00:00
Jeff Sharkey
2d549764be DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: fbf395c220

Change-Id: I453445723ea9f6124d876dc32c6defab42432351
2016-12-02 00:56:26 +00:00
Jeff Sharkey
b9a0b79675 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: 1de465bec2

Change-Id: I14f82fa9c555bea0e71553713436a6836a421691
2016-12-02 00:50:29 +00:00
Jeff Sharkey
704085119d DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: f279a5bc0d  -s ours

Change-Id: I7fde8a3cd529bc495aa7e886988d73e22815c0b4
2016-12-02 00:50:27 +00:00
Treehugger Robot
1981812450 Merge "jni: EventLog replace open coding with android_log_event_list" 2016-12-02 00:39:55 +00:00
Jeff Sharkey
17010dc0d2 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266fb728cf159a90ce4882b3c9bac1887)
2016-12-02 00:05:40 +00:00
Jeff Sharkey
6eee8e37fd DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266fb728cf159a90ce4882b3c9bac1887)
2016-12-01 17:04:32 -07:00
Jeff Sharkey
f279a5bc0d DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266fb728cf159a90ce4882b3c9bac1887)
2016-12-01 23:54:50 +00:00
Jeff Sharkey
1de465bec2 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266fb728cf159a90ce4882b3c9bac1887)
2016-12-01 23:54:04 +00:00
Jeff Sharkey
f084ccd48d DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266fb728cf159a90ce4882b3c9bac1887)
2016-12-01 23:51:49 +00:00
Jeff Sharkey
fbf395c220 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266fb728cf159a90ce4882b3c9bac1887)
2016-12-01 23:51:25 +00:00
Jeff Sharkey
3b0aa060a3 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266fb728cf159a90ce4882b3c9bac1887)
2016-12-01 16:50:29 -07:00
Robert Greenwalt
297e9f9a32 Merge "Get the correct operator name" 2016-12-01 23:29:28 +00:00
Julius D'souza
829c45d5be Merge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into cw-f-dev
am: afccacad68

Change-Id: I6e59afddfc4cb73a1cf913b6799a4c6545464c7b
2016-12-01 22:35:46 +00:00
Julius D'souza
c384a24668 DO NOT MERGE: Sync with master: Add initial ambient light sensor rate
am: 5c7ae14148

Change-Id: I998a032daf0eadf9be003969505958acc1965693
2016-12-01 22:35:41 +00:00
Julius D'souza
afccacad68 Merge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into cw-f-dev 2016-12-01 22:26:06 +00:00
ltrochtova
96fe993907 Merge "Revert "Introduce a new user restriction for disallowing Bluetooth."" am: 4eb075e89f -s ours
am: 834725f579

Change-Id: Idda7a70676bb3d6ac028482064c22e61180768f6
2016-12-01 21:57:04 +00:00
Michael Rosenfeld
2f5f210f7d Merge "Add command line action sequencing." am: 880c9acf4a
am: 3711f2f0c2

Change-Id: I8fae92c813fd7c2d3488b38217420affc5540c08
2016-12-01 21:51:56 +00:00
Zoran Jovanovic
47495ebad0 Get the correct operator name
If the long operator name is not given by RIL,
try to get the short operator name.

Bug: 32791744
Merged-In: I4983ad708c57a650ce4a806e1f53837825bad2db
Depends-On: commit in frameworks/opt/telephony with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db
2016-12-01 21:50:14 +00:00
Android Build Merger (Role)
c428921847 Merge "Merge "AWARE: Abstract structure of match filters" am: f358a69cba am: 7f12aa5470" into nyc-mr1-dev-plus-aosp 2016-12-01 21:49:17 +00:00
ltrochtova
834725f579 Merge "Revert "Introduce a new user restriction for disallowing Bluetooth.""
am: 4eb075e89f  -s ours

Change-Id: Ibcc0b6db64260f444c5884ce9df39395d59a6158
2016-12-01 21:48:07 +00:00
Etan Cohen
61eb0bf8fc Merge "AWARE: Abstract structure of match filters" am: f358a69cba
am: 7f12aa5470

Change-Id: I6d70ec6234752e2d84ad72dcbcbb15dfad6ad5d1
2016-12-01 21:48:02 +00:00
Robert Greenwalt
e2e654f892 Merge "Get the correct operator name" into nyc-mr1-dev-plus-aosp 2016-12-01 21:46:51 +00:00
ltrochtova
6a3e0921fe Merge "Introduce a new user restriction for disallowing Bluetooth." am: 1e9a5eac92 -s ours
am: 0a21ba22e3

Change-Id: I6460fb58be9ecac4bbd4f13ad61537704bd4a150
2016-12-01 21:43:41 +00:00