Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
469,455 Commits 3 Branches 0 Tags
a583aee08d6f1cbecfcc2b68a294badab063cd47
Commit Graph

469455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
a583aee08d Merge "Add USSD codes over IMS feature" am: 9fefb65aa9 am: 09f3bce8c6 
Change-Id: Ie56595ba901ba83e8691583883f75c17a874ccaa
 2020-02-28 16:23:45 +00:00
Automerger Merge Worker
74637f017a Merge "Format incoming call numbers with the national format for Japan" am: 1b637fe165 am: a1a9acbedc 
Change-Id: I18268a53f8fb2c45099adc1a0b7abe9845a93567
 2020-02-28 16:23:12 +00:00
Automerger Merge Worker
fde78e783f Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec041 
Change-Id: I3624c67ef6a93fc902120b1ac3325c11aee4c65a
 2020-02-28 16:09:40 +00:00
Automerger Merge Worker
09f3bce8c6 Merge "Add USSD codes over IMS feature" am: 9fefb65aa9 
Change-Id: I121791b174bb89f758504aad27ddde4b1bd611eb
 2020-02-28 16:03:48 +00:00
Automerger Merge Worker
a1a9acbedc Merge "Format incoming call numbers with the national format for Japan" am: 1b637fe165 
Change-Id: I5cfcb157650b14f26f3493447afc2943327cdd15
 2020-02-28 16:01:54 +00:00
TreeHugger Robot
20905ec041 Merge "Fix testScreenCaptureDisabled" into rvc-dev 2020-02-28 15:54:52 +00:00
Tyler Gunn
9fefb65aa9 Merge "Add USSD codes over IMS feature" 2020-02-28 15:48:56 +00:00
Tyler Gunn
1b637fe165 Merge "Format incoming call numbers with the national format for Japan" 2020-02-28 15:48:15 +00:00
Automerger Merge Worker
04ab8a3c02 Merge "Fix bug where screenshot jumped to the left" into rvc-dev am: aef754d253 
Change-Id: Ib6c9dea3780afe4cece42d259f19fd2001de40fc
 2020-02-28 15:34:40 +00:00
Automerger Merge Worker
ed4230a2b6 Merge "Ignore package mode for MANAGE_EXTERNAL_STORAGE" into rvc-dev am: ab2132d460 
Change-Id: I0bd1b87a7bfd0f380804936ddc281453f7d2de8a
 2020-02-28 15:34:24 +00:00
Automerger Merge Worker
65163078e1 Merge "Fix mmap errors when reading font files via the AssetManager." into rvc-dev am: 8cf381064f 
Change-Id: Ic999cfbb6cd22832e0a07dd567f267095c6c54ec
 2020-02-28 15:33:55 +00:00
Automerger Merge Worker
2007a8754c Merge changes Ic91ff7ac,I7d118592 into rvc-dev am: b2c82a055e 
Change-Id: I269a5198a3175fcba5488d154892fa328e85ca3b
 2020-02-28 15:33:41 +00:00
Miranda Kephart
aef754d253 Merge "Fix bug where screenshot jumped to the left" into rvc-dev 2020-02-28 15:31:55 +00:00
Shafik Nassar
ab2132d460 Merge "Ignore package mode for MANAGE_EXTERNAL_STORAGE" into rvc-dev 2020-02-28 15:30:58 +00:00
Derek Sollenberger
8cf381064f Merge "Fix mmap errors when reading font files via the AssetManager." into rvc-dev 2020-02-28 15:24:02 +00:00
Julia Reynolds
b2c82a055e Merge changes Ic91ff7ac,I7d118592 into rvc-dev 
* changes:
  Fix some more snoozing bugs
  Silence notifications that are manually unsnoozed
 2020-02-28 15:22:20 +00:00
Automerger Merge Worker
9a4f82fb48 Merge "Fix CTS tests" into rvc-dev am: 881b688f68 
Change-Id: I81b6bada76748cdb1380bd7b4e86b2e0bc6cd995
 2020-02-28 15:08:28 +00:00
TreeHugger Robot
881b688f68 Merge "Fix CTS tests" into rvc-dev 2020-02-28 14:50:41 +00:00
Automerger Merge Worker
dabfaf94f0 Merge "Statsd: modules for notifications atoms." into rvc-dev am: 8e41d8ce3c 
Change-Id: Ida78514f74fe345e138cc6250e876e2d42e6826e
 2020-02-28 14:43:29 +00:00
Will Brockman
8e41d8ce3c Merge "Statsd: modules for notifications atoms." into rvc-dev 2020-02-28 14:26:59 +00:00
Automerger Merge Worker
acd7b85663 Merge "PhoneWindow: Fix potential memory leak" into rvc-dev am: ee540c3245 
Change-Id: Icdbbb1aec04d0cb37842f36c4d49bb097b484999
 2020-02-28 14:13:37 +00:00
Alex Johnston
bb1d2a931b Fix testScreenCaptureDisabled 
* A SecurityException was being thrown because getProfiles
  in UserManager cannot be called by the COPE PO for user 0
  without permission MANAGE_USERS or CREATE_USERS.
* Added binderWithCleanCallingIdentity to this method.

Bug: 149941985
Test: atest com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testScreenCaptureDisabled
Change-Id: Iccc60233baaeaa732f197d7aaf31acc9d75a247b
Merged-In: Iccc60233baaeaa732f197d7aaf31acc9d75a247b
(cherry picked from commit 2797594914)
 2020-02-28 14:00:16 +00:00
Adrian Roos
ee540c3245 Merge "PhoneWindow: Fix potential memory leak" into rvc-dev 2020-02-28 13:58:48 +00:00
Automerger Merge Worker
4916b1bdfc Merge "Fix copy-pasted documentation." into rvc-dev am: 936c61aa31 
Change-Id: Ieeeb0c5fb995504d17e1aec36afefc3bb6cabd55
 2020-02-28 13:38:04 +00:00
Automerger Merge Worker
1bcc551296 Merge "Calculates visibility in queryIntent* methods" into rvc-dev am: da9de09a2c 
Change-Id: Ic04af81d2a9f032a17f8a3d297d938034132c813
 2020-02-28 13:37:16 +00:00
TreeHugger Robot
936c61aa31 Merge "Fix copy-pasted documentation." into rvc-dev 2020-02-28 13:32:43 +00:00
Patrick Baumann
da9de09a2c Merge "Calculates visibility in queryIntent* methods" into rvc-dev 2020-02-28 13:14:05 +00:00
Santiago Seifert
51e12d6c29 Fix CTS tests 
Broken since behavioral parameters were added.

Test: CTS.
Bug: 150321580
Bug: 147308781
Bug: 149906115
Change-Id: I8629a78e547cba3552bcc73c0dd55b9317611156
 2020-02-28 12:54:19 +00:00
Automerger Merge Worker
9cb4b5708b Merge "Do not go home when status bar collapse is requested." into rvc-dev am: 2523db7c3f 
Change-Id: I4d1d2a01c7bc27f0be0a6cb888191b2a09d3c3fe
 2020-02-28 12:21:30 +00:00
TreeHugger Robot
2523db7c3f Merge "Do not go home when status bar collapse is requested." into rvc-dev 2020-02-28 12:03:58 +00:00
Automerger Merge Worker
0c75429693 Merge "Show snoozed conversations in conversation header" into rvc-dev am: 66db87d0c0 
Change-Id: I177eb093c3fd69a0c5aa901e677704d0b79ae243
 2020-02-28 11:56:33 +00:00
Automerger Merge Worker
1e0d831efc Merge "Update section header placement logic" into rvc-dev am: 8f034348ca 
Change-Id: I86932a5aae8486cd885e59f702be491f3a9724e2
 2020-02-28 11:55:45 +00:00
Julia Reynolds
66db87d0c0 Merge "Show snoozed conversations in conversation header" into rvc-dev 2020-02-28 11:46:33 +00:00
TreeHugger Robot
8f034348ca Merge "Update section header placement logic" into rvc-dev 2020-02-28 11:46:28 +00:00
Automerger Merge Worker
abfa218340 Merge "Make MediaRouter2 callback classes as abstract" into rvc-dev am: fde0af9177 
Change-Id: If54b64a93020bac289b754c5f108d2ef4e23a637
 2020-02-28 11:41:44 +00:00
TreeHugger Robot
fde0af9177 Merge "Make MediaRouter2 callback classes as abstract" into rvc-dev 2020-02-28 11:38:39 +00:00
Automerger Merge Worker
bdcd29b52d Merge "Restrict app transition maximum duration" into rvc-dev am: f43e6bc49d 
Change-Id: Idd831ca098a2fb4e0b900154b32a857544fc8a70
 2020-02-28 11:35:56 +00:00
Eran Messeri
3f9578be3e Fix copy-pasted documentation. 
Fix the documentation  for USE_INDIVIDUAL_ATTESTATION which was
copy-pasted from another attestation ID type.

Bug: 149475774
Test: That it compiles.
Change-Id: I9366870c8875997321c93fe1db216e91f374b1db
 2020-02-28 11:32:33 +00:00
TreeHugger Robot
f43e6bc49d Merge "Restrict app transition maximum duration" into rvc-dev 2020-02-28 11:17:34 +00:00
Robin Lee
eff035d996 Do not go home when status bar collapse is requested. 
This is only invoked from CTS and related tests. Some of these tests
attempt to launch an activity and then close the status bar in the
setup step. This exits the activity and is not desired.

Test: atest GtsIncidentManagerTestCases
Test: atest CtsAutoFillServiceTestCases
Bug: 150404191
Change-Id: Ic988c537dfbb72b6eac2dc3885bb832848f8df17
 2020-02-28 09:52:48 +00:00
Hyundo Moon
899535c9ff Make MediaRouter2 callback classes as abstract 
This is per API review.

Bug: 149912538
Test: Ran CTS and atest mediaroutertest
Change-Id: Id52bb7b06da4f414099607b1bde781005e47ded3
 2020-02-28 18:27:42 +09:00
Automerger Merge Worker
f4db5f292c Merge "Make libstatssocket shared" into rvc-dev am: 36a845dee4 
Change-Id: I7a8610a353a49af9069bd276f595c2ca2c492c4f
 2020-02-28 09:14:58 +00:00
TreeHugger Robot
36a845dee4 Merge "Make libstatssocket shared" into rvc-dev 2020-02-28 08:56:00 +00:00
Automerger Merge Worker
25ca74d2cb [automerger skipped] Merge "Change icon mappings in MobileSignalController" am: 34bc8d2a88 am: 2381378392 -s ours 
am skip reason: Change-Id Ice6e795675e0c8281531c3cf52ce181a460e4bfd with SHA-1 aa81904bd7 is in history

Change-Id: I72597763f6ffd0fe14771916025b3ac60f227446
 2020-02-28 08:14:58 +00:00
Automerger Merge Worker
2381378392 Merge "Change icon mappings in MobileSignalController" am: 34bc8d2a88 
Change-Id: I4af529f741f6b467141dc5d07a45c232081b947e
 2020-02-28 08:05:16 +00:00
Treehugger Robot
34bc8d2a88 Merge "Change icon mappings in MobileSignalController" 2020-02-28 07:55:33 +00:00
Automerger Merge Worker
3d6568abf7 Merge "Skip no-state checkUseInstalled check inside PackageInfoUtils" into rvc-dev am: a57109b660 
Change-Id: I71a50815c359795959f393a12d6b86d15d3e0f23
 2020-02-28 06:55:58 +00:00
Automerger Merge Worker
01c6c6a38b Merge changes Ia233ca64,I2d0bc216,I94003873 into rvc-dev am: f8d52afa16 
Change-Id: I1e2f9fa4163b37216eda7868525c91693f70a65b
 2020-02-28 06:55:32 +00:00
Automerger Merge Worker
81c404ebcf Use session id to search for rollbacks (2/n) am: 635382efc6 
Change-Id: Ia858ee6f1ecfa369a2eb35a61d86f8230db52fc2
 2020-02-28 06:55:28 +00:00
Automerger Merge Worker
a83c5167e9 Include session id when sending broadcasts (1/n) am: 0757179ff8 
Change-Id: I0640ec4d0f06693921814bd0be749ddac6c68a1b
 2020-02-28 06:55:24 +00:00