Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
425,704 Commits 3 Branches 0 Tags
7dba98658fe3aa9def3eba7dfa89527d6dc692c7
Commit Graph

425704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Stanislav Zholnin
b38e7b71a9 Merge "Atoms for logging permission grants during system upgrade." into qt-dev 
am: 58c51d17d1

Change-Id: I08cf66e049f3668e00de6cc8607b246e1138f6bf
 2019-06-17 13:19:06 -07:00
Stanislav Zholnin
ec9cbdb220 Merge "Atoms for logging permission grants during system upgrade." into qt-dev 
am: 58c51d17d1

Change-Id: I90a927891a207971c86b8abebc8cc9c5457a5f2e
 2019-06-17 13:16:29 -07:00
Sunny Goyal
c73ce70467 Hiding home handle while on home in no-button mode 
> Unifying handling home and back button alpha logic

Test: go home, manual
Bug: 134381592
Change-Id: I93a72cc4ac252f2ced22216f14c50b074e9903c8
 2019-06-17 12:50:24 -07:00
Stanislav Zholnin
58c51d17d1 Merge "Atoms for logging permission grants during system upgrade." into qt-dev 2019-06-17 19:45:41 +00:00
Christine Franks
c475010a13 Merge "Set exact night display last activated time" into qt-r1-dev 
am: 95ebd376f0

Change-Id: I7127ea387c7f276937fa69712b28a79bdba3e471
 2019-06-17 12:40:07 -07:00
Android Build Merger (Role)
98aef7e28f Merge "[automerger skipped] Merge "Remove dependency on OverviewProxyService from StatusBarWindowController" into qt-dev am: b8886dd613 -s ours am: 3fc92dc85e -s ours am skip reason: change_id Ifd6ac77670c408da74a7278e8da5868e78a6a068 with SHA1 dc0eca6cd2 is in history" into qt-r1-dev-plus-aosp 2019-06-17 19:31:19 +00:00
Winson Chung
702526012b [automerger skipped] Merge "Remove dependency on OverviewProxyService from StatusBarWindowController" into qt-dev am: b8886dd613 -s ours 
am: 3fc92dc85e -s ours
am skip reason: change_id Ifd6ac77670c408da74a7278e8da5868e78a6a068 with SHA1 dc0eca6cd2 is in history

Change-Id: I74246504a6ac8aa6b1ff7ae46ef7b3f3b2acba85
 2019-06-17 12:30:14 -07:00
Winson Chung
d752e3cf33 [automerger skipped] Merge "Remove dependency on OverviewProxyService from StatusBarWindowController" into qt-dev am: b8886dd613 
am: fa0eb83c36 -s ours
am skip reason: change_id Ifd6ac77670c408da74a7278e8da5868e78a6a068 with SHA1 dc0eca6cd2 is in history

Change-Id: I0a8bea1fc0273becd1417d52ff703855d8fbaa90
 2019-06-17 12:29:52 -07:00
Christine Franks
95ebd376f0 Merge "Set exact night display last activated time" into qt-r1-dev 2019-06-17 19:21:19 +00:00
Winson Chung
3fc92dc85e [automerger skipped] Merge "Remove dependency on OverviewProxyService from StatusBarWindowController" into qt-dev 
am: b8886dd613 -s ours
am skip reason: change_id Ifd6ac77670c408da74a7278e8da5868e78a6a068 with SHA1 dc0eca6cd2 is in history

Change-Id: If0605af9522bc3a4a18b8bd48575f5118c8581a0
 2019-06-17 12:17:32 -07:00
Winson Chung
fa0eb83c36 Merge "Remove dependency on OverviewProxyService from StatusBarWindowController" into qt-dev 
am: b8886dd613

Change-Id: I6798b83b63a92589c9d8f501d5529d4071e10094
 2019-06-17 12:16:30 -07:00
Winson Chung
b8886dd613 Merge "Remove dependency on OverviewProxyService from StatusBarWindowController" into qt-dev 2019-06-17 19:00:41 +00:00
Julia Reynolds
b1f5aafc91 Use connected boolean as NLS does vs IBinder 
To determine if the CPS can get/send messages. Apparently
the IBinder can be cached in ActivityManager and onBind() is not
always called when a service is connected the second time.

Test: manual; ensure a service recieves an onsubscribe for an
active rule post requestUnbind/requestRebind
Fixes: 62584038

Change-Id: Iffe37242509f3bf26e609e6b423f3928c00156ad
(cherry picked from commit 265d093cd9)
 2019-06-17 17:51:18 +00:00
Varun Anand
8775b0a135 Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459 am: f4c10e8bc2 am: 48f59a0fdf 
am: 2471441b2d

Change-Id: I16884eef6e2b8d64031363cfb4adacc4a0a9ead7
 2019-06-17 10:43:22 -07:00
Android Build Merger (Role)
fda83d5613 Merge "Merge "qt_dev: Fix ContentSuggestions service connection" into qt-dev am: 1ed4ce0161 am: ad1aefd334" into qt-r1-dev-plus-aosp 2019-06-17 17:42:03 +00:00
Perumaal Shanmugam
0efcd000fe Merge "qt_dev: Fix ContentSuggestions service connection" into qt-dev am: 1ed4ce0161 
am: ad1aefd334

Change-Id: Ibb002f803c9558fa4ce12edd45374e7669063cc2
 2019-06-17 10:41:22 -07:00
Perumaal Shanmugam
e647963ac7 Merge "qt_dev: Fix ContentSuggestions service connection" into qt-dev am: 1ed4ce0161 
am: fe440e3884

Change-Id: I8e5de7bf62343450efd77f5c5e7aa17a01d2acd5
 2019-06-17 10:40:51 -07:00
Varun Anand
2471441b2d Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459 am: f4c10e8bc2 
am: 48f59a0fdf

Change-Id: I960e94b03b29282ae2b03f78a19ed2692bd88e05
 2019-06-17 10:33:53 -07:00