Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
365,261 Commits 3 Branches 0 Tags
8ebed82ccbefaae61eeb6ddb66de2d023aedf4bf
Commit Graph

81296 Commits

Author SHA1 Message Date
Tej Singh
8ebed82ccb Merge "ScheduledJobStateChanged: add stop reason" into pi-dev am: dcccfd9742 
am: 7b0b2422ed

Change-Id: Ideaea9c44cbcda65111306b12079e75bbb5ce367
 2018-03-22 02:20:22 +00:00
Makoto Onuki
d62fd06751 Merge "Updated the javadoc of ContentResolver.addPeriodicSync to correct the minimum interval of periodic sync." into pi-dev am: b630550ed1 
am: 5e8a50f135

Change-Id: Ia555e6a2b5c387a86966cd3e10c2e2af15d95589
 2018-03-22 01:53:47 +00:00
kopriva
37bf05d2b2 docs: fixing typo in reference document am: 60b06bd217 am: 2285a662ea 
am: 0dd8c40343

Change-Id: Iaa09e1c22a8cf705b6e5eeb989860b0d6d7dc8c2
 2018-03-22 01:48:24 +00:00
Tej Singh
7b0b2422ed Merge "ScheduledJobStateChanged: add stop reason" into pi-dev 
am: dcccfd9742

Change-Id: Ie6d83624f3d607c5bd3d24aea0bcd28829a2f11a
 2018-03-22 01:43:52 +00:00
Jiyong Park
c296e7f805 Merge changes I7f413e38,I20aba7e9 into pi-dev am: 4d6dc48d24 
am: 189cc7df45

Change-Id: I725063a24bd1c5713cfbdd63753b8fdb0d552a26
 2018-03-22 01:41:21 +00:00
TreeHugger Robot
dcccfd9742 Merge "ScheduledJobStateChanged: add stop reason" into pi-dev 2018-03-22 01:30:52 +00:00
Makoto Onuki
5e8a50f135 Merge "Updated the javadoc of ContentResolver.addPeriodicSync to correct the minimum interval of periodic sync." into pi-dev 
am: b630550ed1

Change-Id: I55806fd7903861437daa1e2740006ef74e3ae2a2
 2018-03-22 01:03:35 +00:00
Makoto Onuki
b630550ed1 Merge "Updated the javadoc of ContentResolver.addPeriodicSync to correct the minimum interval of periodic sync." into pi-dev 2018-03-22 00:51:03 +00:00
kopriva
0dd8c40343 docs: fixing typo in reference document am: 60b06bd217 
am: 2285a662ea

Change-Id: I0337d4a4ba2f30f89d97108163b5098fa51d20af
 2018-03-22 00:50:46 +00:00
Jiyong Park
189cc7df45 Merge changes I7f413e38,I20aba7e9 into pi-dev 
am: 4d6dc48d24

Change-Id: Ib63541d0924b400580d62513864d790a02021de9
 2018-03-22 00:46:46 +00:00
kopriva
2285a662ea docs: fixing typo in reference document 
am: 60b06bd217

Change-Id: Ie0a6380e8287d49b4d80f8742e51345372e5b8a9
 2018-03-22 00:39:02 +00:00
Fyodor Kupolov
1a1092f83d Merge "Added BinderCallsStatsService" into pi-dev am: 163a57d71e 
am: c434073d49

Change-Id: I12cdf4815840286fe044b8071d70cca590497a86
 2018-03-22 00:32:21 +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
Tyler Gunn
4a9263a268 Merge "Add Telecom debug setting for enabling enhanced call blocking." am: 727097a400 am: c0411e0be5 
am: b77daf6a8f

Change-Id: I1ae91c6e5dc605c32845e6412baf383e3299a9ff
 2018-03-22 00:28:51 +00:00
Makoto Onuki
4dd8235aa8 Merge "Implement new BS warning / notification flow (1/2)" into pi-dev am: ff61d8872c 
am: 4e92e3b5a3

Change-Id: Iae5a438fb116f7a068e49e0b972627f74481ac92
 2018-03-22 00:02: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
Yi Jin
019c3d9ffe Merge "Remove am/wm.proto which is redundant. The naming convention is defined in core/proto/README.md" into pi-dev am: 32ca41d028 
am: 4876868997

Change-Id: I0e93606474636cd9c75607631cfec1924442bd69
 2018-03-21 23:20:17 +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
nharold
301e5429ad Merge "Add NonNull Annotations To IpSec API Surface" am: baa4bf51c1 am: 08949e354f 
am: 66bce84357

Change-Id: I9c248e33b3999017b27927c14a7806604157ee97
 2018-03-21 22:00:08 +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
Liefu Liu
5c0d7b3a7f Updated the javadoc of ContentResolver.addPeriodicSync to correct the minimum interval of periodic sync. 
Bug: 76033438
Change-Id: I1ccb7ae174f8f13dae24296a3fb7e9dfcd77c7fa
Fixes: 76033438
Test: javadoc only. presubmit only.
 2018-03-21 21:28:43 +00:00
Lenka Trochtova
2c06f14104 Merge "Return a boolean from the mandatory backup transport setter." into pi-dev am: 2f81559d29 
am: bc9f74c83e

Change-Id: I7448a88114201e78056d3cc75153c2deebb61bb3
 2018-03-21 21:24:26 +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
Fyodor Kupolov
2ab7ea88a3 Merge "Include additional information in the dumpsys" into pi-dev am: 38e09dd7e1 
am: 07c746cdf3

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

Change-Id: I98ab1007f8a597d337bfabfea14b0bf26be231e3
 2018-03-21 18:46:47 +00:00
Jason Monk
733f5e4e44 Merge "Merge "Some Slices API refinement" into pi-dev am: 1543171d3e" into pi-dev-plus-aosp 
am: 743d013856

Change-Id: Ie36d62b98a08b11d5f9fe77512b912f6aadf3555
 2018-03-21 18:35:14 +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
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
309d1242f5 Merge "UsageEvents for slices pinning" into pi-dev am: 17d3b47e20 
am: 7ea088bb22

Change-Id: I2afad70eda6734cec85fbb80c426955693049833
 2018-03-21 16:59:48 +00:00
TreeHugger Robot
c97cd14751 Merge "Show hint instead of auto-populating timepicker." 2018-03-21 16:54:44 +00:00
TreeHugger Robot
4345352b32 Merge "Fix DatePicker highlight to be year-aware." 2018-03-21 16:52:38 +00:00