Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
424,792 Commits 3 Branches 0 Tags
71215098b8a2c8a39b531c07319b0e45788df6ed
Commit Graph

424792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
71215098b8 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" am: 3d478475d6 -s ours am: 7069b0bcee -s ours 
am: 5102df973b

Change-Id: Iaa86834d3b592a1b8b3b3f8e8531951c2ed7a03f
 2019-06-10 13:45:24 -07:00
Winson
32afa7ce2f Merge "Expose PermissionManager as TestApi and fix SplitPermissionInfo equality" into qt-dev am: d703395fcb 
am: 5d53d4b564

Change-Id: Ie25ad2a9c758b941279ca60189f78bd68c46a602
 2019-06-10 13:36:22 -07:00
Android Build Merger (Role)
9180f22365 Merge "[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am: c0ff987df5 -s ours am: 93d358bb6e -s ours am: 08db015eae" into qt-r1-dev-plus-aosp 2019-06-10 20:33:27 +00:00
The Android Open Source Project
af1dec6b23 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am: c0ff987df5 -s ours am: 93d358bb6e -s ours 
am: 08db015eae

Change-Id: Ie54d3005ce4f8bca3f6b8c593169fabd6fba3ba9
 2019-06-10 13:29:56 -07:00
Winson
02c612552f Merge "Expose PermissionManager as TestApi and fix SplitPermissionInfo equality" into qt-dev am: d703395fcb 
am: 7347c0f704

Change-Id: If3f0a0e539ced53c291b67b2a750004583f26840
 2019-06-10 13:28:35 -07:00
Xin Li
5102df973b [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" am: 3d478475d6 -s ours 
am: 7069b0bcee -s ours
am skip reason: subject contains skip directive

Change-Id: I68211100ca00254b264de63c44bebe95c22bf919
 2019-06-10 13:24:00 -07:00
Winson
5d53d4b564 Merge "Expose PermissionManager as TestApi and fix SplitPermissionInfo equality" into qt-dev 
am: d703395fcb

Change-Id: I10e09a0bc15d9f4782ac9d91878becb9046581c3
 2019-06-10 13:22:46 -07:00
Winson
7347c0f704 Merge "Expose PermissionManager as TestApi and fix SplitPermissionInfo equality" into qt-dev 
am: d703395fcb

Change-Id: Id965c774d70ad823de8f32d0e63b6d0ce0471754
 2019-06-10 13:22:40 -07:00
The Android Open Source Project
08db015eae [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am: c0ff987df5 -s ours 
am: 93d358bb6e -s ours
am skip reason: subject contains skip directive

Change-Id: Ibefe9bb9026527ba5aef05b35d420ddd5c583835
 2019-06-10 13:17:41 -07:00
Xin Li
7069b0bcee [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" 
am: 3d478475d6 -s ours
am skip reason: subject contains skip directive

Change-Id: If9b679d15f4b3cb312ea0e9f1efd25793aaa0585
 2019-06-10 13:14:05 -07:00
TreeHugger Robot
d703395fcb Merge "Expose PermissionManager as TestApi and fix SplitPermissionInfo equality" into qt-dev 2019-06-10 20:12:57 +00:00
The Android Open Source Project
93d358bb6e [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master 
am: c0ff987df5 -s ours
am skip reason: subject contains skip directive

Change-Id: I9c23317ac5c74bc1d89ccd29c8eb19fdd269affe
 2019-06-10 13:06:05 -07:00
Xin Li
3d478475d6 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" 2019-06-10 19:54:58 +00:00
Android Build Merger (Role)
80da354542 Merge "Merge "docs: Fixing broken HTML" into qt-dev am: b230dd4fe6 am: 6de1a4c375" into qt-r1-dev-plus-aosp 2019-06-10 18:55:03 +00:00
Andrew Solovay
83388b8840 Merge "docs: Fixing broken HTML" into qt-dev am: b230dd4fe6 
am: 6de1a4c375

Change-Id: I4fe3ccc877368e25606108cb8f304c0bc6761e63
 2019-06-10 11:54:22 -07:00
Andrew Solovay
9f0dfc8764 Merge "docs: Fixing broken HTML" into qt-dev am: b230dd4fe6 
am: be2a68c47e

Change-Id: Idb85389aeffdc0661adc685abb7f164f9f9437ab
 2019-06-10 11:53:30 -07:00
Andrew Solovay
6de1a4c375 Merge "docs: Fixing broken HTML" into qt-dev 
am: b230dd4fe6

Change-Id: I3d8716ebdc0d58ee33ef1d84e881888bf6c6d956
 2019-06-10 11:46:35 -07:00
Andrew Solovay
be2a68c47e Merge "docs: Fixing broken HTML" into qt-dev 
am: b230dd4fe6

Change-Id: I1bd88c7508c580b69078f62a352958106cb9ae13
 2019-06-10 11:43:31 -07:00
Andrew Solovay
b230dd4fe6 Merge "docs: Fixing broken HTML" into qt-dev 2019-06-10 18:23:40 +00:00
Neil Fuller
b1d03b902d Merge "Merge "Switch to use tz data module tz files, not runtime module" am: 1c5515c76a am: dfaa438238" into qt-dev-plus-aosp 
am: 0b81bdb1b0

Change-Id: Ic31add0052a380fa1ae73fce4677d9cff0ca5228
 2019-06-10 10:44:28 -07:00
Matt Pietal
28f25302a6 Merge "Sharesheet - Hide direct share area for low ram devices" into qt-dev am: fcc4d76a97 
am: e1422bca65

Change-Id: I8227671350c544607f65813e6d99fa0a4a4dae5a
 2019-06-10 10:42:32 -07:00
Matt Pietal
d595ffd2fb Merge "Sharesheet - Hide direct share area for low ram devices" into qt-dev am: fcc4d76a97 
am: 1fd7d07ddf

Change-Id: I71b6c3e325b40b32cc732f909b9af87532763263
 2019-06-10 10:39:07 -07:00
Android Build Merger (Role)
0b81bdb1b0 Merge "Merge "Switch to use tz data module tz files, not runtime module" am: 1c5515c76a am: dfaa438238" into qt-dev-plus-aosp 2019-06-10 17:38:53 +00:00
Android Build Merger (Role)
b5a5ff7bba Merge "Merge "Inject dependencies instead of fetching them" into qt-dev am: 6c88570f25 am: dd7b6f93f2" into qt-r1-dev-plus-aosp 2019-06-10 17:37:29 +00:00
Neil Fuller
1bfb1f9e3c Merge "Switch to use tz data module tz files, not runtime module" am: 1c5515c76a 
am: dfaa438238

Change-Id: I5d06cdc406af437e08379dc1125d8ce682a88aae
 2019-06-10 10:36:56 -07:00
Matt Pietal
e1422bca65 Merge "Sharesheet - Hide direct share area for low ram devices" into qt-dev 
am: fcc4d76a97

Change-Id: I1e2d8680afa856ee1f310d292eeb52ccb7826f8f
 2019-06-10 10:36:14 -07:00
Winson Chung
d3a4e795e9 Merge "Inject dependencies instead of fetching them" into qt-dev am: 6c88570f25 
am: dd7b6f93f2

Change-Id: I1e0271e21f7f2867e5f38bbce0fffb3918a333eb
 2019-06-10 10:36:14 -07:00
Winson Chung
cb65d5f5e4 Merge "Inject dependencies instead of fetching them" into qt-dev am: 6c88570f25 
am: 47e606e92e

Change-Id: Iba0fb55964822d9fe282a48b82797ca34494b637
 2019-06-10 10:36:12 -07:00
Matt Pietal
1fd7d07ddf Merge "Sharesheet - Hide direct share area for low ram devices" into qt-dev 
am: fcc4d76a97

Change-Id: Ia4622b13fcb9befbf34932b86c247dc3057323a5
 2019-06-10 10:33:44 -07:00
Winson Chung
dd7b6f93f2 Merge "Inject dependencies instead of fetching them" into qt-dev 
am: 6c88570f25

Change-Id: Ic8549b021d9a5f8fa8096083f870916c3e2c93a3
 2019-06-10 10:32:08 -07:00
Neil Fuller
dfaa438238 Merge "Switch to use tz data module tz files, not runtime module" 
am: 1c5515c76a

Change-Id: I832044d65fdcb0323ae8eb2500586b12f2e7fae8
 2019-06-10 10:31:36 -07:00
Winson Chung
47e606e92e Merge "Inject dependencies instead of fetching them" into qt-dev 
am: 6c88570f25

Change-Id: I997dda75e796c8e8730af11c5b748683c7cc6688
 2019-06-10 10:31:10 -07:00
TreeHugger Robot
fcc4d76a97 Merge "Sharesheet - Hide direct share area for low ram devices" into qt-dev 2019-06-10 17:29:52 +00:00
Neil Fuller
1c5515c76a Merge "Switch to use tz data module tz files, not runtime module" 2019-06-10 17:21:51 +00:00
Winson Chung
6c88570f25 Merge "Inject dependencies instead of fetching them" into qt-dev 2019-06-10 17:14:39 +00:00
Android Build Merger (Role)
9d6f823327 Merge "Merge "Add timeout for setPermissionGrantState" into qt-dev am: 3baa0b34e3 am: 155cb7c247" into qt-r1-dev-plus-aosp 2019-06-10 16:52:16 +00:00
Eugene Susla
b8342102f0 Merge "Add timeout for setPermissionGrantState" into qt-dev am: 3baa0b34e3 
am: 3d5b18aab1

Change-Id: Ib1052e2bc4c1f5f175fa5c27bb348c3673ed1051
 2019-06-10 09:50:56 -07:00
Eugene Susla
1dcd163a83 Merge "Add timeout for setPermissionGrantState" into qt-dev am: 3baa0b34e3 
am: 155cb7c247

Change-Id: I2313f9c920058dd3347de0c4087b09d24813fa8f
 2019-06-10 09:50:54 -07:00
Eugene Susla
155cb7c247 Merge "Add timeout for setPermissionGrantState" into qt-dev 
am: 3baa0b34e3

Change-Id: Ib1a295ed4de405ce8fc30d53a4334ef1ed2005e6
 2019-06-10 09:46:53 -07:00
Eugene Susla
3d5b18aab1 Merge "Add timeout for setPermissionGrantState" into qt-dev 
am: 3baa0b34e3

Change-Id: I1a342c7f85a75d6a66296455fabad769a133a89b
 2019-06-10 09:45:56 -07:00
TreeHugger Robot
3baa0b34e3 Merge "Add timeout for setPermissionGrantState" into qt-dev 2019-06-10 16:32:44 +00:00
The Android Open Source Project
c0ff987df5 DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master 
Bug: 134605042
Change-Id: Ifb8de28ea860cec31308c8472c26766a6461aa5d
 2019-06-10 09:32:28 -07:00
Android Build Merger (Role)
e37e709471 Merge "Merge "Sharesheet - Adjust timeouts and logic for direct share" into qt-dev am: 503b489384 am: 8b19acac90" into qt-r1-dev-plus-aosp 2019-06-10 15:05:50 +00:00
Matt Pietal
5453f56de6 Merge "Sharesheet - Adjust timeouts and logic for direct share" into qt-dev am: 503b489384 
am: 8b19acac90

Change-Id: Ic15ced53d9dc6ba1b63acd601b1acabe66250b16
 2019-06-10 08:05:10 -07:00
Matt Pietal
6cd0e8e3f5 Merge "Sharesheet - Adjust timeouts and logic for direct share" into qt-dev am: 503b489384 
am: e214c2e1df

Change-Id: I0978602cef7d4f452202b2c7824f879588af8469
 2019-06-10 08:05:07 -07:00
Matt Pietal
e214c2e1df Merge "Sharesheet - Adjust timeouts and logic for direct share" into qt-dev 
am: 503b489384

Change-Id: I909a6fab95581a4c001486aef84d70ccc5221e50
 2019-06-10 08:00:11 -07:00
Matt Pietal
8b19acac90 Merge "Sharesheet - Adjust timeouts and logic for direct share" into qt-dev 
am: 503b489384

Change-Id: Ibbbb8947eeaae6c2f883f725de8c6dec8b25792c
 2019-06-10 08:00:10 -07:00
TreeHugger Robot
503b489384 Merge "Sharesheet - Adjust timeouts and logic for direct share" into qt-dev 2019-06-10 14:46:28 +00:00
Matt Pietal
6e88b51026 Sharesheet - Hide direct share area for low ram devices 
Make sure to force the item count to 0 to make sure the direct share
area stays hidden.

Bug: 134776740
Test: Low ram device, manual
Change-Id: I598752db5747b1c845495af7ae2f591488799352
 2019-06-10 10:20:15 -04:00
Roland Levillain
528f9f2111 Merge "Use suffixes instead of stems in the definition of module app_process." am: 9c2eef9841 am: 244f224221 
am: 2899709c72

Change-Id: Ia6347223262fd8721005763c80d2397a230a14c6
 2019-06-10 05:22:31 -07:00