Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
430,853 Commits 3 Branches 0 Tags
b10003de5e4345191b91cbab048b7e85bbb71ccf
Commit Graph

430853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sunny Goyal
b10003de5e Merge "Merge "Hiding home handle while on home in no-button mode" into qt-dev am: 702c5199f9" into qt-dev-plus-aosp am: 7c82454948 
am: 13674adc91

Change-Id: I0c853f27182d7a3eca08308fb53a14d658e10c48
 2019-06-17 19:14:33 -07:00
Sunny Goyal
dc9a7f26d3 Merge "Merge "Hiding home handle while on home in no-button mode" into qt-dev am: 702c5199f9 am: 29a2b1109c" into qt-r1-dev-plus-aosp 
am: 7dba98658f

Change-Id: I6790b39fc5a50d227d5dfd336fd23e710c26fad7
 2019-06-17 19:07:50 -07:00
Hunter Knepshield
a228624ea2 [automerger skipped] Merge "do not print phone number which is considered as pii" am: 84b311d3a2 am: 741e0f13f3 -s ours am: 04bcca3bbe -s ours 
am: d1450d0c16 -s ours
am skip reason: change_id Ibdc4689f41a8dac162b617d6972bb72b3dd86e4e with SHA1 720da9bff0 is in history

Change-Id: I678522af61844560067243b5cdcb19342add0714
 2019-06-17 18:54:20 -07:00
Sunny Goyal
13674adc91 Merge "Merge "Hiding home handle while on home in no-button mode" into qt-dev am: 702c5199f9" into qt-dev-plus-aosp 
am: 7c82454948

Change-Id: Iddae07edfbc3513639df92f4968dd616eafc9257
 2019-06-17 18:48:12 -07:00
Android Build Merger (Role)
7dba98658f Merge "Merge "Hiding home handle while on home in no-button mode" into qt-dev am: 702c5199f9 am: 29a2b1109c" into qt-r1-dev-plus-aosp 2019-06-18 01:45:14 +00:00
Sunny Goyal
c215e91363 Merge "Hiding home handle while on home in no-button mode" into qt-dev am: 702c5199f9 
am: 29a2b1109c

Change-Id: Idefb8448b5d641475c431f60b847182f8df65df6
 2019-06-17 18:44:28 -07:00
Hunter Knepshield
d1450d0c16 [automerger skipped] Merge "do not print phone number which is considered as pii" am: 84b311d3a2 am: 741e0f13f3 -s ours 
am: 04bcca3bbe -s ours
am skip reason: change_id Ibdc4689f41a8dac162b617d6972bb72b3dd86e4e with SHA1 720da9bff0 is in history

Change-Id: If75b537207b3fd5d4692c4344a72b2f9ff319d4f
 2019-06-17 18:43:17 -07:00
TreeHugger Robot
4f2f99c6b1 Merge "Sync input transactions after ACTION_UP" 2019-06-18 01:38:41 +00:00
Sunny Goyal
29a2b1109c Merge "Hiding home handle while on home in no-button mode" into qt-dev 
am: 702c5199f9

Change-Id: I4c6f425736ff84ed21d513b00ee16219240b4b74
 2019-06-17 17:41:33 -07:00
Android Build Merger (Role)
7c82454948 Merge "Merge "Hiding home handle while on home in no-button mode" into qt-dev am: 702c5199f9" into qt-dev-plus-aosp 2019-06-18 00:41:09 +00:00
Sunny Goyal
b38233df6f Merge "Hiding home handle while on home in no-button mode" into qt-dev 
am: 702c5199f9

Change-Id: Ic17426a0f4bf807a2c3eab2e4e246b42514e1923
 2019-06-17 17:40:35 -07:00
Hunter Knepshield
04bcca3bbe [automerger skipped] Merge "do not print phone number which is considered as pii" am: 84b311d3a2 
am: 741e0f13f3 -s ours
am skip reason: change_id Ibdc4689f41a8dac162b617d6972bb72b3dd86e4e with SHA1 720da9bff0 is in history

Change-Id: I1757509b476a45e7c9e7488a62b29fdc0d6a38dd
 2019-06-17 17:39:57 -07:00
Hunter Knepshield
741e0f13f3 Merge "do not print phone number which is considered as pii" 
am: 84b311d3a2

Change-Id: Iff8873febf767d8a3dc7cd42385699656c3a40d4
 2019-06-17 17:26:47 -07:00
TreeHugger Robot
702c5199f9 Merge "Hiding home handle while on home in no-button mode" into qt-dev 2019-06-18 00:10:17 +00:00
Lucas Dupin
8f182abb7c Merge "Merge "Shortened and adjustable screen timeouts" into qt-r1-dev am: 969c3d9b87" into qt-r1-dev-plus-aosp 
am: 706016714b

Change-Id: Ie2f3a219e60d8b63d16360a3ae4bc5d109125b55
 2019-06-17 16:44:54 -07:00
Elliott Hughes
e6936e2792 Merge "Move off ZipString and over to std::string/std::string_view as appropriate." into qt-dev-plus-aosp am: ee1c95f060 
am: 0566225cb8

Change-Id: I351ea009ee322ecd8bd117e4b2b686c636fb6770
 2019-06-17 16:39:52 -07:00
Treehugger Robot
84b311d3a2 Merge "do not print phone number which is considered as pii" 2019-06-17 23:33:41 +00:00
Android Build Merger (Role)
706016714b Merge "Merge "Shortened and adjustable screen timeouts" into qt-r1-dev am: 969c3d9b87" into qt-r1-dev-plus-aosp 2019-06-17 23:27:53 +00:00
Lucas Dupin
1cd005b881 Merge "Shortened and adjustable screen timeouts" into qt-r1-dev 
am: 969c3d9b87

Change-Id: I5f85c2db188915ff82bfc8ffa2299406d780e285
 2019-06-17 16:26:25 -07:00
Elliott Hughes
0566225cb8 Merge "Move off ZipString and over to std::string/std::string_view as appropriate." into qt-dev-plus-aosp 
am: ee1c95f060

Change-Id: Ic87fff08eaf240bbaa370432b6955520206d3882
 2019-06-17 16:26:05 -07:00
Julia Reynolds
31d749f007 Merge "Use connected boolean as NLS does vs IBinder" into qt-dev am: 23dcdcefde am: de0ce4ce11 
am: 0ae507ab72

Change-Id: I8a37300624477bbbccc9aedbe4ade4bcb9732d6f
 2019-06-17 16:24:14 -07:00
Vishnu Nair
8493c94980 Merge "[AML] Check if launched activity has changed when handling visibility changes" into qt-dev am: cc0d8f3982 am: 4c1d56dd8a 
am: b0746171d9

Change-Id: Ib59da454706eaf78841fd2d607958d48d4216c4c
 2019-06-17 16:17:58 -07:00
TreeHugger Robot
969c3d9b87 Merge "Shortened and adjustable screen timeouts" into qt-r1-dev 2019-06-17 23:03:58 +00:00
Elliott Hughes
ee1c95f060 Merge "Move off ZipString and over to std::string/std::string_view as appropriate." into qt-dev-plus-aosp 2019-06-17 22:54:01 +00:00
Philip P. Moltmann
6f8b97e042 Merge "Handle invalid package name in isPermissionsReviewRequired" into qt-dev am: f4924f1ccb am: 9d2da1ebf0 
am: 9d84e0a38d

Change-Id: Idfe3bf36a8d8d92f9d03716a069d9e19209061d7
 2019-06-17 15:51:21 -07:00
Julia Reynolds
74454cddfe Merge "Use connected boolean as NLS does vs IBinder" into qt-dev am: 23dcdcefde am: fb6dd2a8c0 
am: 6ce5a4739c

Change-Id: I857e9208d6d1488afab069595112d49b62b0de2e
 2019-06-17 15:47:50 -07:00
Julia Reynolds
0ae507ab72 Merge "Use connected boolean as NLS does vs IBinder" into qt-dev am: 23dcdcefde 
am: de0ce4ce11

Change-Id: I236d3298ff2e089a0429be38bb864d46a6c61f7e
 2019-06-17 15:45:54 -07:00
Vishnu Nair
5cd0bccdfb Merge "[AML] Check if launched activity has changed when handling visibility changes" into qt-dev am: cc0d8f3982 am: 3aa7b56cb3 
am: 852dacf55e

Change-Id: Ice4d75466c2c67395e4c55698777f8eedea82956
 2019-06-17 15:43:47 -07:00
Philip P. Moltmann
c4209ed191 Merge "Handle invalid package name in isPermissionsReviewRequired" into qt-dev am: f4924f1ccb am: 9f7dd342f8 
am: c5bdd4dbd4

Change-Id: Ieb20023eca2675c71c26b78dc4cc6b94dded4f54
 2019-06-17 15:36:29 -07:00
Vishnu Nair
b0746171d9 Merge "[AML] Check if launched activity has changed when handling visibility changes" into qt-dev am: cc0d8f3982 
am: 4c1d56dd8a

Change-Id: If81d45b3d104c9af13f29c99da2ff776297adefc
 2019-06-17 15:33:28 -07:00
Philip P. Moltmann
9d84e0a38d Merge "Handle invalid package name in isPermissionsReviewRequired" into qt-dev am: f4924f1ccb 
am: 9d2da1ebf0

Change-Id: Id57e32a3444951c86bee7ff537bbf3e6eccf400c
 2019-06-17 15:30:42 -07:00
Julia Reynolds
de0ce4ce11 Merge "Use connected boolean as NLS does vs IBinder" into qt-dev 
am: 23dcdcefde

Change-Id: I81055d02bb5d3c7ef86b9022d7dabaec4e55b651
 2019-06-17 15:28:11 -07:00
Julia Reynolds
6ce5a4739c Merge "Use connected boolean as NLS does vs IBinder" into qt-dev am: 23dcdcefde 
am: fb6dd2a8c0

Change-Id: I2b71eba8b76aabf2af1891148ddc7ee18a1d81ca
 2019-06-17 15:26:54 -07:00
Vishnu Nair
852dacf55e Merge "[AML] Check if launched activity has changed when handling visibility changes" into qt-dev am: cc0d8f3982 
am: 3aa7b56cb3

Change-Id: I747002da6cdd0452564a2b8778bdcff92c7eadc1
 2019-06-17 15:24:02 -07:00
Philip P. Moltmann
c5bdd4dbd4 Merge "Handle invalid package name in isPermissionsReviewRequired" into qt-dev am: f4924f1ccb 
am: 9f7dd342f8

Change-Id: Ia91ac00eb81788e73b378dee223b8998c0bc98eb
 2019-06-17 15:20:55 -07:00
Julia Reynolds
fb6dd2a8c0 Merge "Use connected boolean as NLS does vs IBinder" into qt-dev 
am: 23dcdcefde

Change-Id: I51f2fec6b85c4d9e3e6a5b39cd0a2e09955ec802
 2019-06-17 15:16:05 -07:00
Vishnu Nair
4c1d56dd8a Merge "[AML] Check if launched activity has changed when handling visibility changes" into qt-dev 
am: cc0d8f3982

Change-Id: I3973ca5fc03f0f16fe3d1e6a17f1440f3fbf5276
 2019-06-17 15:04:30 -07:00
Vishnu Nair
3aa7b56cb3 Merge "[AML] Check if launched activity has changed when handling visibility changes" into qt-dev 
am: cc0d8f3982

Change-Id: I0db27e1d8544ce647d62e63916843bf86ce59561
 2019-06-17 15:02:41 -07:00
Stanislav Zholnin
74208c36ab Merge "Merge "Atoms for logging permission grants during system upgrade." into qt-dev am: 58c51d17d1 am: b38e7b71a9" into qt-r1-dev-plus-aosp 
am: f4385ef1bb

Change-Id: I8f5998ee5cf6c91450038851efe8e8e4d48c46c9
 2019-06-17 15:01:48 -07:00
Philip P. Moltmann
9d2da1ebf0 Merge "Handle invalid package name in isPermissionsReviewRequired" into qt-dev 
am: f4924f1ccb

Change-Id: I1c92858c522048e891ce87625cc5848fc2583c02
 2019-06-17 15:00:59 -07:00
TreeHugger Robot
23dcdcefde Merge "Use connected boolean as NLS does vs IBinder" into qt-dev 2019-06-17 22:00:04 +00:00
Philip P. Moltmann
9f7dd342f8 Merge "Handle invalid package name in isPermissionsReviewRequired" into qt-dev 
am: f4924f1ccb

Change-Id: I8f8c84976910109b1eb2eba4a7eb0089fc767b04
 2019-06-17 14:59:45 -07:00
Stanislav Zholnin
4797da84f1 Merge "Atoms for logging permission grants during system upgrade." into qt-dev am: 58c51d17d1 am: ec9cbdb220 
am: 057b962517

Change-Id: I553d4504ffca78374fe55900a934f73b88aa1f01
 2019-06-17 14:57:45 -07:00
TreeHugger Robot
cc0d8f3982 Merge "[AML] Check if launched activity has changed when handling visibility changes" into qt-dev 2019-06-17 21:56:08 +00:00
Android Build Merger (Role)
f4385ef1bb Merge "Merge "Atoms for logging permission grants during system upgrade." into qt-dev am: 58c51d17d1 am: b38e7b71a9" into qt-r1-dev-plus-aosp 2019-06-17 21:43:32 +00:00
Stanislav Zholnin
ff4d737a9d Merge "Atoms for logging permission grants during system upgrade." into qt-dev am: 58c51d17d1 
am: b38e7b71a9

Change-Id: I8926d4a4ff382a814244cfbf540834b8a2a25a67
 2019-06-17 14:42:46 -07:00
Stanislav Zholnin
057b962517 Merge "Atoms for logging permission grants during system upgrade." into qt-dev am: 58c51d17d1 
am: ec9cbdb220

Change-Id: I51325b66d39f5888fade65ce07587256b6857c08
 2019-06-17 14:41:50 -07:00
TreeHugger Robot
f4924f1ccb Merge "Handle invalid package name in isPermissionsReviewRequired" into qt-dev 2019-06-17 21:26:57 +00:00
Hunter Knepshield
286ca032c2 do not print phone number which is considered as pii 
do not print phonenumber in subscriptionInfo

Bug: 133191331
Change-Id: Ibdc4689f41a8dac162b617d6972bb72b3dd86e4e
Merged-In: Ibdc4689f41a8dac162b617d6972bb72b3dd86e4e
 2019-06-17 14:19:46 -07:00
Mihai Popa
c00e2718d0 Merge "[Magnifier-87] Fix deadlock causing ANR" 2019-06-17 21:13:15 +00:00