Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
354,581 Commits 3 Branches 0 Tags
0137f81fafb77ed553d301a23f23e2ec2091069d
Commit Graph

78428 Commits

Author SHA1 Message Date
TreeHugger Robot
5ccc664159 Merge "Set ActivityView's rect as tap exclude region" 2018-01-19 00:23:33 +00:00
Doris Liu
25be4e0461 Merge "Expose some hidden APIs in Choreographer to CTS" 2018-01-18 23:38:49 +00:00
Felipe Leme
db6b0fecb4 Merge "Moved Field Classification score logic to ExtServices." 2018-01-18 23:33:44 +00:00
Makoto Onuki
5cc9f721ce Merge "Revert "Add setting/experiment for small battery devices to have"" 2018-01-18 23:10:54 +00:00
TreeHugger Robot
265fc005c7 Merge "Use LinkedHashMap on CharSequenceTransformation to keep order of insertions." 2018-01-18 22:51:34 +00:00
Makoto Onuki
12391f22df Revert "Add setting/experiment for small battery devices to have" 
This reverts commit 9a60382be1.

Reason for revert: Broke battery saver

Bug: 72168928
Bug: 69259147

Change-Id: I09664653686a51c297224c863c4fc6d1ff7e5caf
Test: Manual test
Test: atest CtsBatterySavingTestCases
 2018-01-18 22:05:40 +00:00
TreeHugger Robot
b6e7e7531d Merge "Fix crash in EditText#getText" 2018-01-18 21:30:13 +00:00
TreeHugger Robot
940ba0c8fe Merge "Rename CrossProfileApps API as per API council feedback" 2018-01-18 21:10:18 +00:00
Tony Mak
b0d22627e9 Rename CrossProfileApps API as per API council feedback 
Three changes:
1. android.content.pm.crossprofile - > android.content.pm
2. getProfileSwitchingIcon -> getProfileSwitchingIconDrawable
3. startMainActivity “user” parameter should be named “targetUser”

Test: atest FrameworksServicesTests:com.android.server.pm.CrossProfileAppsServiceImplTest
Test: atest frameworks/base/core/tests/coretests/src/android/content/pm/CrossProfileAppsTest.java
Test: atest cts/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/CrossProfileAppsHostSideTest.java

FIXES: 71818128

Change-Id: Icf9a6d1f8b6808935ffd79b43185c7b12235f349
 2018-01-18 21:07:50 +00:00
TreeHugger Robot
881a432d08 Merge "Compute hyphenated word pieces in MeasuredText" 2018-01-18 20:32:54 +00:00
Robert Berry
1ae3cf14c3 Merge "Rename RecoveryManager to RecoveryController" 2018-01-18 20:00:13 +00:00
Calin Juravle
d5d154efcd Merge "Support installation of DexMetadata files (.dm)" 2018-01-18 19:53:54 +00:00
Fyodor Kupolov
7bd6319215 Merge "Clarify usage of context in the JavaDoc" 2018-01-18 19:21:00 +00:00
Felipe Leme
bc055b0ef1 Moved Field Classification score logic to ExtServices. 
Bug: 70939974
Test: atest CtsAutoFillServiceTestCases:FieldsClassificationTest \
            CtsAutoFillServiceTestCases:UserDataTest
Test: atest CtsAutoFillServiceTestCases

Change-Id: I75fd59b5d7530fcd7095b26f6e592d7459c7d235
 2018-01-18 10:40:30 -08:00
Seigo Nonaka
87b1547c92 Compute hyphenated word pieces in MeasuredText 
Bug: 67504091
Test: bit CtsTextTestCases:*
Change-Id: Id1ff5abbf6d433a2d8baad364133fca98d1fe450
 2018-01-18 18:30:02 +00:00
Stanley Tng
518c679c1f Merge "Added APIs for Connection-oriented channels" am: e1992384e0 am: 288915bedc 
am: 39f133eed2

Change-Id: I79afa5ef129790588dca91266f79a6125edefd06
 2018-01-18 18:19:25 +00:00
Stanley Tng
39f133eed2 Merge "Added APIs for Connection-oriented channels" am: e1992384e0 
am: 288915bedc

Change-Id: Iaf2aa40e8e6e2621c146fcabe0f46c3dd1bfedc4
 2018-01-18 18:08:37 +00:00
Robert Berry
74928a1dfb Rename RecoveryManager to RecoveryController 
This fixes the linting error that happens when we attempt to make this a
@SystemApi.

Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Ib9eea030874608d73ceeff21ee8d7e9d5a75bce8
 2018-01-18 18:00:10 +00:00
Stanley Tng
288915bedc Merge "Added APIs for Connection-oriented channels" 
am: e1992384e0

Change-Id: If7cb99a59aee8640f6dddd96f2388e2a5284df45
 2018-01-18 17:59:19 +00:00
Andrew Sapperstein
e9b8e09f03 Merge "Ignore first crash dialog." 2018-01-18 17:49:33 +00:00
TreeHugger Robot
6ccd91cec3 Merge "Use RecoverySession object to hide session IDs (redux)" 2018-01-18 17:44:37 +00:00
Petr Cermak
4fa2aa03ea Merge "Add "results source" parameter to RemoteInput" 2018-01-18 17:39:34 +00:00
TreeHugger Robot
4212de2e74 Merge "Add adb command to get max running users" 2018-01-18 16:50:31 +00:00
Treehugger Robot
e1992384e0 Merge "Added APIs for Connection-oriented channels" 2018-01-18 16:42:33 +00:00
Bryce Lee
e6c2b50229 Merge "Disallow starting activities without new task from non-activity context." 2018-01-18 15:49:15 +00:00
Kenny Guy
0e4bc3f2ba Merge "Add more brightness config details to dumpsys" 2018-01-18 15:18:08 +00:00
Alex Chau
c12189b24c Add adb command to get max running users 
Bug: 72033601
Test: New command is working
Change-Id: I38746a2c03a6da35e7d8a149e1fb0b3604234dbc
 2018-01-18 15:17:22 +00:00
Robert Berry
2bcdad9533 Use RecoverySession object to hide session IDs (redux) 
Session IDs are an implementation detail that the framework can (and should)
abstract away. This was previously reverted due to breaking master.

Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I4427c818348c054ada39d799b6da3b739f27eba9
 2018-01-18 14:36:32 +00:00
TreeHugger Robot
e8ffec1661 Merge "Add hint to indicate 'see more' type content" 2018-01-18 14:17:14 +00:00
Clara Bayarri
b102cc2435 Fix crash in EditText#getText 
The fact that View's constructor may call other methods before the
TextView constructor has a chance to initialize values means that
getText() may return null in the rare case where it is called
before the constructor.

Protect getText() from running into errors when the text is null,
as it just means the value is not ready yet.

Bug: 71638589
Test: CTS in topic
Change-Id: Ie11233416385353f78e3ee27fb0d3ec9b671512f
 2018-01-18 12:36:00 +00:00
Robert Berry
588a06f5a2 Merge "Revert "Use RecoverySession object to hide session IDs"" 2018-01-18 12:24:06 +00:00
Robert Berry
9fa87627ed Revert "Use RecoverySession object to hide session IDs" 
This reverts commit 988c55ce67.

Reason for revert: broke some tests

Change-Id: Ib43099aebc8ff025e052337475bab13445da74eb
 2018-01-18 12:23:33 +00:00
TreeHugger Robot
20f29fdaca Merge "Fix extra space in Suggestions Popup" 2018-01-18 12:20:37 +00:00
TreeHugger Robot
a2ade1b151 Merge "Fixing incorrect doc string" 2018-01-18 11:55:35 +00:00
Android Build Merger (Role)
c9e76ed0a1 Merge "Merge "Javadoc fixes to Time" am: b3c2efc615 am: b51c638a6c am: 90a56a59d5" 2018-01-18 10:41:00 +00:00
Neil Fuller
dd704e316b Merge "Javadoc fixes to Time" am: b3c2efc615 am: b51c638a6c 
am: 90a56a59d5

Change-Id: I62545bdd0604ee0911249abd7628c99868093c77
 2018-01-18 10:40:42 +00:00
TreeHugger Robot
c4e99794e9 Merge "Use RecoverySession object to hide session IDs" 2018-01-18 10:40:24 +00:00
Neil Fuller
90a56a59d5 Merge "Javadoc fixes to Time" am: b3c2efc615 
am: b51c638a6c

Change-Id: Ifea3eb9d25754155681b1f74096eacac1fa0b259
 2018-01-18 10:31:35 +00:00
TreeHugger Robot
15b0089c01 Merge "KeyStore: Remove duplicate method" 2018-01-18 10:26:44 +00:00
Neil Fuller
b51c638a6c Merge "Javadoc fixes to Time" 
am: b3c2efc615

Change-Id: I9793670f518d15fc42caa01a519c33e451998a77
 2018-01-18 10:26:13 +00:00
TreeHugger Robot
437513c083 Merge "Rename KeychainProtectionParameter to KeychainProtectionParams" 2018-01-18 10:09:09 +00:00
Jan Althaus
1331068084 Fixing incorrect doc string 
Test: N/A
Change-Id: I718c44902c44097b5883fd1f204ef66279b5cca4
 2018-01-18 10:50:32 +01:00
TreeHugger Robot
0b2941fb09 Merge "Promote DISALLOW_RUN_IN_BACKGROUND to SystemAPI" 2018-01-18 09:26:37 +00:00
Neil Fuller
b3c2efc615 Merge "Javadoc fixes to Time" 2018-01-18 09:18:27 +00:00
Robert Berry
988c55ce67 Use RecoverySession object to hide session IDs 
Session IDs are an implementation detail that the framework can (and should)
abstract away.

Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Ieba641a9b54ac9bba197a6e9749b621a07e40c67
 2018-01-18 08:25:26 +00:00
Robert Berry
9e1bd362df Rename KeychainProtectionParameter to KeychainProtectionParams 
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Iab6d85d0be38e1a09ce78bb96b8f68493de65be9
 2018-01-18 08:21:43 +00:00
Jeff Sharkey
8ec0201e8f Merge "Add "not congested" network capability." am: ffaddf73de am: abb158f712 
am: 1ed2bee762

Change-Id: I836fedeab34f34a43e0257e395fca1f735bc6d61
 2018-01-18 04:20:44 +00:00
Jeff Sharkey
1ed2bee762 Merge "Add "not congested" network capability." am: ffaddf73de 
am: abb158f712

Change-Id: I2c7276bd657f5805c0b6492a216435270023a3c6
 2018-01-18 04:10:00 +00:00
Jeff Sharkey
abb158f712 Merge "Add "not congested" network capability." 
am: ffaddf73de

Change-Id: I02ea25610df63b40547c3114c0f9a9ef59560e90
 2018-01-18 03:58:13 +00:00
Lorenzo Colitti
36ec567b4a Merge "Add public API methods for private DNS." am: aacb56a7c0 am: f193c6d37d 
am: 7b212d3562

Change-Id: Icd04bc83624ea4d13ac7737e6f9a7b0c5f0f7314
 2018-01-18 03:36:37 +00:00