Commit Graph

309172 Commits

Author SHA1 Message Date
TreeHugger Robot
da57f6b420 Merge "TIF: Add more fields for guide view on launcher" 2017-01-26 06:00:56 +00:00
Jim Miller
a8b207c531 Merge "Remove binder call from fingerprint HIDL interface." 2017-01-26 05:38:47 +00:00
Winson Chung
452ff6db94 DO NOT MERGE Fixing crash in SystemUI fetching task description icons.
When we compose the TaskDescription for the task, we update it with
information from each activity from top down.  If an activity has a
saved icon, the filepath for that icon will be encoded with the user
id of the activity and saved into the task description.  However, if
that activity's user is different from the user id of the root
activity of the task, we will later try to fetch the icon with the
user id of the task which will cause an exception to be thrown.

Instead, because the task description describes the task and information
belonging to the task description is always fetched as the user of
that task, we can save the icon with the task's user encoded instead
of the activity's.

Bug: 34692261
Test: Launch primary user activity with a custom task description icon
      in a task that is rooted with a work profile activity, then restart
      before the primary user activity is finished.

Change-Id: I66240cd488271e677cce7923cfef8e3e0cea5621
2017-01-26 05:35:38 +00:00
Jeff Sharkey
b96eb94044 Relax permission for shared storage UUID.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug: 27948817, 30927649
Change-Id: Ia5217718a22020787fc3e3fd21584f22a8be7611
2017-01-25 22:17:18 -07:00
Hyundo Moon
27c793146d Merge "ExifInterface: Accept decimal values for RATIONAL formats" 2017-01-26 04:55:59 +00:00
Android Build Merger (Role)
5894f5483a Merge "Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: b69d7554d7" into nyc-mr2-dev-plus-aosp am: 5c44db22bc" 2017-01-26 04:55:39 +00:00
Android Build Merger (Role)
0b2de3fcc2 Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: b69d7554d7 am: 51493d3915" 2017-01-26 04:55:21 +00:00
Elliot Waite
34b8d33142 Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: b69d7554d7" into nyc-mr2-dev-plus-aosp
am: 5c44db22bc

Change-Id: I8977abc0f27e906cc9ef5aac11bd0aa07e13cd2e
2017-01-26 04:54:28 +00:00
Elliot Waite
62920a66ca Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: b69d7554d7
am: 51493d3915

Change-Id: I963846ab58574620bd5140d1f64175086ced5416
2017-01-26 04:54:18 +00:00
Android Build Merger (Role)
279978bef3 Merge "Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: 44cafbb018" into nyc-mr2-dev-plus-aosp am: 174a1f97e2" 2017-01-26 04:53:56 +00:00
Android Build Merger (Role)
db75966ba5 Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: 44cafbb018 am: 210d818222" 2017-01-26 04:53:39 +00:00
Elliot Waite
ca30804520 Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: 44cafbb018" into nyc-mr2-dev-plus-aosp
am: 174a1f97e2

Change-Id: I4f1b1810827d454c7e74d08198d918682f292134
2017-01-26 04:52:42 +00:00
Elliot Waite
36f42f23cb Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: 44cafbb018
am: 210d818222

Change-Id: Iae8b5750a1b1001d490ec1bca9eaea841a95634f
2017-01-26 04:52:34 +00:00
Android Build Merger (Role)
675b4a7321 Merge "Merge "Fix @links in reference docs. am: 54de77470d am: ab978c035e am: de2557f369" into nyc-mr2-dev-plus-aosp am: 33af3282b0" 2017-01-26 04:52:04 +00:00
Android Build Merger (Role)
b86ecd0f90 Merge "Fix @links in reference docs. am: 54de77470d am: ab978c035e am: de2557f369 am: 55697fa1af" 2017-01-26 04:51:46 +00:00
Elliot Waite
2173c7809c Merge "Fix @links in reference docs. am: 54de77470d am: ab978c035e am: de2557f369" into nyc-mr2-dev-plus-aosp
am: 33af3282b0

Change-Id: I97ca6bd39bb30d2a940e49429452b8842a81698d
2017-01-26 04:50:50 +00:00
Brian Carlstrom
24c03cabb8 Merge "Update IS_OMTP_VOICEMAIL value to "is_omtp_voicemail" in API" 2017-01-26 04:50:43 +00:00
Elliot Waite
3966231f65 Fix @links in reference docs. am: 54de77470d am: ab978c035e am: de2557f369
am: 55697fa1af

Change-Id: If23a8945a3ebec0595464937f54b0b4d4765268e
2017-01-26 04:50:42 +00:00
Android Build Merger (Role)
cefb76ad2e Merge "Fix @links in reference docs. am: 54de77470d am: ab978c035e am: 28ba4722a9 am: 9b21265b2c" 2017-01-26 04:50:16 +00:00
Elliot Waite
0ce4b0e4c3 Fix @links in reference docs. am: 54de77470d am: ab978c035e am: 28ba4722a9
am: 9b21265b2c

Change-Id: If246ebdb36cf2832d5a6c42cbe752e290b6fb6e8
2017-01-26 04:49:33 +00:00
TreeHugger Robot
de3b86e73e Merge "Add notification channel groups." 2017-01-26 04:49:31 +00:00
Android Build Merger (Role)
5c44db22bc Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: b69d7554d7" into nyc-mr2-dev-plus-aosp 2017-01-26 04:46:39 +00:00
Android Build Merger (Role)
174a1f97e2 Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: 44cafbb018" into nyc-mr2-dev-plus-aosp 2017-01-26 04:46:25 +00:00
Elliot Waite
51493d3915 Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50
am: b69d7554d7

Change-Id: I3222069c804f524d29eebb0bde502aec5a92c04f
2017-01-26 04:45:59 +00:00
Elliot Waite
210d818222 Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50
am: 44cafbb018

Change-Id: I77fd396040a31c69d98e3ca9d2bddd4f2632419f
2017-01-26 04:45:49 +00:00
Pavlin Radoslavov
e3d08aebdc Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" am: 0645c21163 am: b3f1eaa504 am: e667f7795f
am: 0946c26b39

Change-Id: Idd92101991a52af343a8479ef944a8396f4ab887
2017-01-26 04:45:45 +00:00
Android Build Merger (Role)
33af3282b0 Merge "Fix @links in reference docs. am: 54de77470d am: ab978c035e am: de2557f369" into nyc-mr2-dev-plus-aosp 2017-01-26 04:45:39 +00:00
Elliot Waite
55697fa1af Fix @links in reference docs. am: 54de77470d am: ab978c035e
am: de2557f369

Change-Id: I3d4637ec03906dd520edaeadecdfe2fd4faa471b
2017-01-26 04:44:56 +00:00
Elliot Waite
9b21265b2c Fix @links in reference docs. am: 54de77470d am: ab978c035e
am: 28ba4722a9

Change-Id: I98177a8cf0a20677e140406bb7371474ca259e5b
2017-01-26 04:44:54 +00:00
Steve McKay
aa2305373d Merge "DO NOT MERGE: Allow launcher icon to be config'd in overlay." into nyc-mr2-dev am: 32e6da5b84
am: ea02035c4d  -s ours

Change-Id: I8c9cbbf10e1058180bdbb127d9657c4f6fe9c886
2017-01-26 04:44:46 +00:00
Steve McKay
8d5c6855b8 DO NOT MERGE: Allow launcher icon to be config'd in overlay. am: 24cd592b24
am: 1552895f55  -s ours

Change-Id: Ic8916aee1861f93883c51afe9da1b09a7eb1a467
2017-01-26 04:41:50 +00:00
Elliot Waite
44cafbb018 Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4
am: 6cc3802e50

Change-Id: I9b581b9a8be3d5d10abfbbc5770301fe67f94f78
2017-01-26 04:40:54 +00:00
Elliot Waite
b69d7554d7 Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4
am: 6cc3802e50

Change-Id: I52ddc7a726e5b12d136e0e524225422e5e6aa1a6
2017-01-26 04:40:47 +00:00
Pavlin Radoslavov
0946c26b39 Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" am: 0645c21163 am: b3f1eaa504
am: e667f7795f

Change-Id: Ia6722702175e196d5b980ec7be3a093e972cfbfb
2017-01-26 04:40:43 +00:00
Elliot Waite
28ba4722a9 Fix @links in reference docs. am: 54de77470d
am: ab978c035e

Change-Id: If0d0613362e0ea95cf48eaf9a16d3eea48b589ea
2017-01-26 04:39:57 +00:00
Elliot Waite
de2557f369 Fix @links in reference docs. am: 54de77470d
am: ab978c035e

Change-Id: Ibec2b85708f9ff923156f4d867c9c2f71c75d41c
2017-01-26 04:39:53 +00:00
Brian Carlstrom
d2577a7c9e Update IS_OMTP_VOICEMAIL value to "is_omtp_voicemail" in API
Test: m -j32 checkbuild docs
Change-Id: I03b229ab8e5f0e16459a8f3e4a89bd1421ff637e
2017-01-25 20:39:13 -08:00
Steve McKay
ea02035c4d Merge "DO NOT MERGE: Allow launcher icon to be config'd in overlay." into nyc-mr2-dev
am: 32e6da5b84

Change-Id: I7a90eb649be34b2f99af885ad4559fa9e1d5f727
2017-01-26 04:38:25 +00:00
Elliot Waite
a54b54f50c Merge "Fix @see tag." 2017-01-26 04:37:37 +00:00
Dan Sandler
8e032e15e6 Notification Channels come to SystemUI's own notifications.
There are five channels at present:
    ALERTS - low battery etc.
    SCREENSHOTS - progress & result
    SECURITY - notifications hidden due to policy
    STORAGE - disk low
    STATUS - basically everything else

The importance for each channel should match the legacy
priority of the notifications it carries.

Bug: 34250937
Test: runtest systemui
Change-Id: I5915ca453258caea63b0d9bd756893db05e8d600
2017-01-25 23:37:06 -05:00
Steve McKay
1552895f55 DO NOT MERGE: Allow launcher icon to be config'd in overlay.
am: 24cd592b24

Change-Id: Id9f70ccb67f48c4b4b290fd493f3e7725f1b7a5b
2017-01-26 04:35:46 +00:00
Elliot Waite
6cc3802e50 Merge "Fix @links in reference docs." into nyc-mr1-dev
am: 3366d4beb4

Change-Id: I90aa2e4ca0553d5816024486015514b3e5d7bc86
2017-01-26 04:35:00 +00:00
Pavlin Radoslavov
e667f7795f Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" am: 0645c21163
am: b3f1eaa504

Change-Id: Ie1f0e958b93bfb898a7fdbe3ed8f732190a3e7ac
2017-01-26 04:34:57 +00:00
Elliot Waite
ab978c035e Fix @links in reference docs.
am: 54de77470d

Change-Id: Id38c30bad13d6b61ed504a06471b9f197b360f7b
2017-01-26 04:34:57 +00:00
TreeHugger Robot
32e6da5b84 Merge "DO NOT MERGE: Allow launcher icon to be config'd in overlay." into nyc-mr2-dev 2017-01-26 04:31:38 +00:00
Pavlin Radoslavov
b3f1eaa504 Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection"
am: 0645c21163

Change-Id: I66a7a5f8dc423c7999b4e0a39a272a837e66c847
2017-01-26 04:29:57 +00:00
Elliot Waite
3366d4beb4 Merge "Fix @links in reference docs." into nyc-mr1-dev 2017-01-26 04:29:46 +00:00
Treehugger Robot
0645c21163 Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" 2017-01-26 04:23:43 +00:00
TreeHugger Robot
d1b6dcbea6 Merge "Don't return self if not a profile" 2017-01-26 03:57:42 +00:00
Doris Liu
40e8469789 Refine the comparator for the animation event sorting
BUG: 34719156
Test: manual
Change-Id: Iad96967c8ee6a3b3b661fb9de4e750d7b935b3f7
2017-01-25 19:40:51 -08:00