Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
364,035 Commits 3 Branches 0 Tags
189cc7df45dcd26903718e292a307ba952fff718
Commit Graph

89080 Commits

Author SHA1 Message Date
Jiyong Park
189cc7df45 Merge changes I7f413e38,I20aba7e9 into pi-dev 
am: 4d6dc48d24

Change-Id: Ib63541d0924b400580d62513864d790a02021de9
 2018-03-22 00:46:46 +00:00
TreeHugger Robot
4d6dc48d24 Merge changes I7f413e38,I20aba7e9 into pi-dev 
* changes:
  Remove FlpHardwareProvider
  Create the stubs lib for com.android.location.provider
 2018-03-22 00:29:38 +00:00
Fyodor Kupolov
c434073d49 Merge "Added BinderCallsStatsService" into pi-dev 
am: 163a57d71e

Change-Id: I8e4d9269f4cdad6d809f13ffa9e1f1f2447965a3
 2018-03-21 23:26:59 +00:00
Tyler Gunn
b77daf6a8f Merge "Add Telecom debug setting for enabling enhanced call blocking." am: 727097a400 
am: c0411e0be5

Change-Id: I99ba46420fb998112709d63abc502f6742e9558a
 2018-03-21 23:18:23 +00:00
Fyodor Kupolov
163a57d71e Merge "Added BinderCallsStatsService" into pi-dev 2018-03-21 23:02:58 +00:00
Makoto Onuki
4e92e3b5a3 Merge "Implement new BS warning / notification flow (1/2)" into pi-dev 
am: ff61d8872c

Change-Id: I7d3709fcc5b51833c1747398ae488a872ce7a147
 2018-03-21 22:56:17 +00:00
Makoto Onuki
ff61d8872c Merge "Implement new BS warning / notification flow (1/2)" into pi-dev 2018-03-21 22:32:33 +00:00
Tyler Gunn
c0411e0be5 Merge "Add Telecom debug setting for enabling enhanced call blocking." 
am: 727097a400

Change-Id: I2b2eea70d0c755acc9c2f14a79bca91ea37720d1
 2018-03-21 22:11:33 +00:00
Yi Jin
4876868997 Merge "Remove am/wm.proto which is redundant. The naming convention is defined in core/proto/README.md" into pi-dev 
am: 32ca41d028

Change-Id: I73b1ed0210f01ad6bf81089fef408765f34426a1
 2018-03-21 21:49:17 +00:00
TreeHugger Robot
32ca41d028 Merge "Remove am/wm.proto which is redundant. The naming convention is defined in core/proto/README.md" into pi-dev 2018-03-21 21:24:19 +00:00
Tyler Gunn
727097a400 Merge "Add Telecom debug setting for enabling enhanced call blocking." 2018-03-21 21:02:24 +00:00
Nathan Harold
095b9e8e1c Merge changes I4c26aea7,I79911434 into pi-dev 
* changes:
  Check mOwnedByTransform to avoid DELSA on SPI
  Expose add/removeAddress for IpSecInterfaces
 2018-03-21 20:59:02 +00:00
nharold
66bce84357 Merge "Add NonNull Annotations To IpSec API Surface" am: baa4bf51c1 
am: 08949e354f

Change-Id: I1aa2077978eba9e13586aeb4501769e2dd42728a
 2018-03-21 20:37:59 +00:00
nharold
08949e354f Merge "Add NonNull Annotations To IpSec API Surface" 
am: baa4bf51c1

Change-Id: I1393526aca627b430868816a83c8a40452521fc2
 2018-03-21 20:28:55 +00:00
Lenka Trochtova
bc9f74c83e Merge "Return a boolean from the mandatory backup transport setter." into pi-dev 
am: 2f81559d29

Change-Id: Ibb77d5f16312f03504e7ced961b92e48f37342bc
 2018-03-21 20:13:51 +00:00
TreeHugger Robot
2f81559d29 Merge "Return a boolean from the mandatory backup transport setter." into pi-dev 2018-03-21 19:34:52 +00:00
Makoto Onuki
16a0dd2d5e Implement new BS warning / notification flow (1/2) 
- Show the battery saver confirmation dialog only for the first time.
- Start counting # of manual activations, which will be used in a
follow-up CL.

Bug: 74120126
Test: Manual tests with ./vendor/google_experimental/users/omakoto/android-battery-tester
Test: m -j ROBOTEST_FILTER=BatterySaverUtilsTest RunSettingsLibRoboTests
Test: cd frameworks/base/packages/SystemUI/tests && \
        atest src/com/android/systemui/power/PowerUITest.java src/com/android/systemui/power/PowerNotificationWarningsTest.java
Change-Id: If6a081a6222e6a87c4cd332364c89856e7648a36
 2018-03-21 12:15:51 -07:00
Beverly
ea28fee05d Merge "Category message is sufficient for message notif" into pi-dev 
am: b24d84b222

Change-Id: I5502cade1ec859215f76d29966f0663f387cc433
 2018-03-21 18:31:47 +00:00
Fyodor Kupolov
07c746cdf3 Merge "Include additional information in the dumpsys" into pi-dev 
am: 38e09dd7e1

Change-Id: I3dd0f79193cdb71b46ff9d4477d431ee6a703fb3
 2018-03-21 18:25:44 +00:00
Tim Volodine
03d64cdd9e Merge "WebView Tracing API: remove LARGE_BUFFER, make RECORD_CONTINUOUSLY the default mode" into pi-dev 
am: 158a18108b

Change-Id: I557685531c2d80fd3eb4792d5b8aacffd9ae7d2e
 2018-03-21 18:15:52 +00:00
Jason Monk
e98e31ce3f Merge "Some Slices API refinement" into pi-dev 
am: 1543171d3e

Change-Id: Ib921eac77b9154800aa784ec3d3f4846f788a9a7
 2018-03-21 17:45:59 +00:00
TreeHugger Robot
b24d84b222 Merge "Category message is sufficient for message notif" into pi-dev 2018-03-21 17:43:40 +00:00
Fyodor Kupolov
38e09dd7e1 Merge "Include additional information in the dumpsys" into pi-dev 2018-03-21 17:25:28 +00:00
TreeHugger Robot
158a18108b Merge "WebView Tracing API: remove LARGE_BUFFER, make RECORD_CONTINUOUSLY the default mode" into pi-dev 2018-03-21 17:14:47 +00:00
Tim Volodine
1a07ccc07e WebView Tracing API: remove LARGE_BUFFER, make RECORD_CONTINUOUSLY the default mode 
This patch:
- remove the RECORD_UNTIL_FULL_LARGE_BUFFER tracing option, because
  this does not appear really useful in the production setting as
  the buffer size limit exceeds the device memory and can grow
  uncontrollably large.
- make RECORD_CONTINUOUSLY the default mode for tracing, to make
  sure the least memory is used by default (typically 4x less than the
  previous default RECORD_UNTIL_FULL).
- add some missing IntDef values (to make them match with the constants)

BUG: 63750258
Test: CTS

Change-Id: Ib3698273dee776ebc7a8388fc1bd8c80255e3b63
 2018-03-21 17:12:20 +00:00
Nathan Harold
8fd26f67fd Add NonNull Annotations To IpSec API Surface 
This CL adds NonNull annotations to a large
number of method returns and parameters as
part of API council feedback.

Bug: 72473424
Test: compilation (docstring-only change)
Change-Id: I2f865dde56fe12116c461ad98e9460bf1802ce18
 2018-03-21 17:08:34 +00:00
TreeHugger Robot
1543171d3e Merge "Some Slices API refinement" into pi-dev 2018-03-21 17:06:40 +00:00
Benedict Wong
f801b8ae69 Merge "Added implementation for VTI add/remove address" into pi-dev 2018-03-21 17:03:52 +00:00
Benedict Wong
d7582684b6 Merge "Add support for auth-only transforms" into pi-dev 2018-03-21 17:03:48 +00:00
Jason Monk
7ea088bb22 Merge "UsageEvents for slices pinning" into pi-dev 
am: 17d3b47e20

Change-Id: I559072719451cd2cff5b49f7d89c3ee92b995ac1
 2018-03-21 16:37:57 +00:00
TreeHugger Robot
17d3b47e20 Merge "UsageEvents for slices pinning" into pi-dev 2018-03-21 16:07:32 +00:00
Rubin Xu
452eeca413 Merge "Restore state if password change fails" into pi-dev 
am: 655877cd84

Change-Id: Ide07b138b75ea7624362b20c87d4e1d580cc6270
 2018-03-21 16:03:22 +00:00
TreeHugger Robot
655877cd84 Merge "Restore state if password change fails" into pi-dev 2018-03-21 15:41:34 +00:00
Lenka Trochtova
56681f761e Return a boolean from the mandatory backup transport setter. 
Bug: 73813043
Bug: 64012357
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testGetAndSetMandatoryBackupTransport
Test: cts-tradefed run cts -m CtsBackupHostTestCase --test android.cts.backup.BackupDeviceOwnerHostSideTest

Change-Id: I7f47a41070b767a6be8b986be485b4ad782690cf
 2018-03-21 15:48:41 +01:00
Beverly
eb455965ef Category message is sufficient for message notif 
If a notification is marked with category message, then
it is sufficient enough to be deemed a "message" notification.
However, to be considered an important message, we still
check if the message is from the default messaging app and has
category = message.

Change-Id: I4f2b502634b805919bdf8b82e3bdf475c0992bdd
Fixes:76019310
Test: AttentionManagementVerifierActivity
Test: atest services/tests/uiservicestests/src/com/android/server/notification/NotificationComparatorTest.java
 2018-03-21 10:46:33 -04:00
Jason Monk
1918ef7569 UsageEvents for slices pinning 
Test: atest frameworks/base/services/tests/servicestests
Bug: 73455786
Change-Id: I6a37f5525c29d3f47aa37e262c8834840309ba44
 2018-03-21 10:03:29 -04:00
Robert Berry
b0850c9a16 Merge "Add RecoverySession importKeyChainSnapshot method" into pi-dev 
am: 889e78cb28

Change-Id: Iae6f730236f5aaa15c39cf04bef5ebe925d51643
 2018-03-21 12:39:18 +00:00
Bo Zhu
518b7de5af Merge "Use the new root cert file under the core/ folder" into pi-dev 
am: 82235880f6

Change-Id: I95c6f25ce33d9778dde668e807de38f6fec2c8ea
 2018-03-21 12:29:15 +00:00
Robert Berry
889e78cb28 Merge "Add RecoverySession importKeyChainSnapshot method" into pi-dev 2018-03-21 12:25:37 +00:00
Gustav Sennton
283747b58c Merge "Add API WebView.getWebViewLooper()" into pi-dev 
am: 6951716952

Change-Id: I912664ece4b41853dcac61f0b6adf11a0eb854c0
 2018-03-21 12:17:45 +00:00
TreeHugger Robot
82235880f6 Merge "Use the new root cert file under the core/ folder" into pi-dev 2018-03-21 12:10:23 +00:00
Rubin Xu
682d167580 Restore state if password change fails 
Bug: 73299306
Fixes: 73299306
Test: Call LockPatternUtils.clearLock() with wrong password,
      make sure device still unlocks after reboot
Change-Id: I640fc62cbe0c0c57e980455d4f499df02dee0832
 2018-03-21 12:05:04 +00:00
TreeHugger Robot
6951716952 Merge "Add API WebView.getWebViewLooper()" into pi-dev 2018-03-21 11:59:28 +00:00
Robert Berry
4a5c87def0 Add RecoverySession importKeyChainSnapshot method 
This imports the keys directly into the keystore of LockSettingsService,
allowing them to be accessed via the RecoveryController getKey method.
This is better as it does not expose raw key material to any app.

Bug: 74345822
Test: runtest frameworks-services -p \
      com.android.server.locksettings.recoverablekeystore

Change-Id: I4991b0cff1d2fa2e5bd0b53a71c096499e93e98b
 2018-03-21 10:24:41 +00:00
Ben Lin
d40d6e2d05 Merge "Add new Intent start a package's Open By Default page directly." into pi-dev 
am: 01cee8e686

Change-Id: I56334cdbf91ef32ce46062a437a132c9817198bc
 2018-03-21 07:12:12 +00:00
Seigo Nonaka
ccaf61ff44 Merge "Stop creating PrecomputedText in StaticLayout" into pi-dev 
am: be8b90b966

Change-Id: I99b803df9addde2bb3206ed1d9079217707ed3b9
 2018-03-21 06:57:06 +00:00
Ben Lin
01cee8e686 Merge "Add new Intent start a package's Open By Default page directly." into pi-dev 2018-03-21 06:07:45 +00:00
Philip P. Moltmann
9dd3e7d300 Add SoundTriggerDetectionService 
am: 18e3eb8168

Change-Id: I4bb7ada74c36df4a64956c9c36a1675aad1f6645
 2018-03-21 06:00:01 +00:00
Philip P. Moltmann
961db4b07d Expose SoundTriggerManager and SoundTrigger APIs 
am: a5fd0294c7

Change-Id: I71c2698aa282d33fb5468164b0b5bf90b28f8323
 2018-03-21 05:56:25 +00:00
Yohei Yukawa
32355d12be Merge "Fix confusing Log.e message in SpellCheckerSession" into pi-dev 
am: efcd6e1ceb

Change-Id: Id97254633677446fee312d8cf2f9110548393237
 2018-03-21 05:49:49 +00:00