Commit Graph

1080 Commits

Author SHA1 Message Date
yuanjiahsu
8eb9d4711b resolve merge conflicts of 2cb9a70cac to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic1db72d57f3003bcec0fd8f7fbb2dc4ec7b5dcf3
2018-09-17 23:46:14 +08:00
Yuanjia Hsu
2cb9a70cac Merge "Add feature flag in Settings." am: 55b91f6d93
am: b04fcd5842

Change-Id: I22e073bcbe7c2bacfdce44dd4c05b47fab3059f1
2018-09-17 07:25:33 -07:00
TreeHugger Robot
f147f12863 Merge "Add feature flag for seamless transfer" 2018-09-14 02:43:02 +00:00
Michael Wachenschwanz
3f6039393e Merge "Intial ProtoInputStream checkin" 2018-09-13 02:02:19 +00:00
Michael Wachenschwanz
8d38b29ba7 Intial ProtoInputStream checkin
Enable proto reading on the Android Framework with a memory efficient
pull parser.

Fixes: 112269636
Test: atest CtsProtoTestCases
Change-Id: If8331edb1ec393acd724ffb5d27d6efad1a42a80
2018-09-12 18:54:19 -07:00
jackqdyulei
5caf811f99 Remove battery app list feature flag
It is not used anymore

Bug: 115542275
Test: Build
Change-Id: I91be9c4179e6ddf9f6613ec05d9eeb1fc458b536
2018-09-12 12:59:17 -07:00
yuanjiahsu
88363e9b2f Add feature flag in Settings.
User can enable/disable faster emergency phone call feature by switching
this flag from Settings, and the old flag switched by adb command was
replaced by this feature flag.

Test: Manually
Bug: 113539598
Change-Id: Ie38f4657bfd76d8386ce2a075f4ec5d0038f5c3d
2018-09-11 15:04:51 +08:00
jackqdyulei
c2da1a2244 Add feature flag for seamless transfer
Change-Id: Ic9edff6ee60125794c1db5a8e271919d92cbe570
Fixes: 114451741
Test: Build
2018-09-07 13:37:32 -07:00
Ashley Rose
2b9a3355ec Fix javadoc syntax in TypedValue
Fixes: 114296097
Test: make
Change-Id: Ib5b8fef1607487cc0a37f58fe63f67c151cd12fb
2018-09-06 19:06:51 -04:00
Ashley Rose
66b0919dd2 Merge "Add isColorType to TypedValue" 2018-09-06 15:44:41 +00:00
Ashley Rose
aa554ae636 Add isColorType to TypedValue
There's a lot of places that used TypedValue.TYPE_FIRST_COLOR_INT and
TypedValue.TYPE_LAST_COLOR_INT, and I'd like to propose that it's enough
of an implementation detail that it should have a dedicated public
method to query it.

Fixes: 114126626
Test: CTS tests to be added
Change-Id: I4d2a927cc3d2e999985d7e1c9b647d513fff53fc
2018-09-05 19:30:53 -04:00
TreeHugger Robot
46fef17ee5 Merge "Add feature flag for data usage v2." 2018-09-05 20:16:27 +00:00
st.ji
298cce2320 Merge "Add DENSITY_600" am: 8ac363088c am: e79f44a393
am: cd6e61cd53

Change-Id: Ifa769017f525bbbfc8f2a94871e33aaaf0606407
2018-09-03 14:08:57 -07:00
st.ji
cd6e61cd53 Merge "Add DENSITY_600" am: 8ac363088c
am: e79f44a393

Change-Id: I9a4cc11b8d45bafa5a4c25171c51b663b1091188
2018-09-03 13:59:46 -07:00
Doris Ling
1098ab0e07 Add feature flag for data usage v2.
Bug: 111751694
Test: build
Change-Id: I5700ddd9d1c92a104fa87d0150e2de2f5d13574a
2018-08-30 15:07:16 -07:00
jackqdyulei
cbfdc1d172 Add feature flag for mobile network v2
Bug: 113069948
Test: Build
Change-Id: I72d7d8db164a4c99692366f0d8a4d8421e385d0b
2018-08-22 15:26:24 -07:00
Fan Zhang
ce580b1e49 Remove condition_manager_v2 flag
Bug: 112485407
Test: rebuild
Change-Id: Ib04299b7e74729cb9fe01be84b3a79b1ec5c06d8
2018-08-21 11:03:50 -07:00
st.ji
d41b9ac699 Add DENSITY_600
Add 600dpi as a supported screen density

Test: run android.dpi.cts.ConfigurationTest#testScreenConfiguration and android.app.cts.ActivityManagerMemoryClassTest#testGetMemoryClass

Change-Id: Iac673eae2d82c27d96e279c076454af2f5933208
Signed-off-by: st.ji <st.ji@samsung.com>
2018-08-20 02:23:42 +00:00
Fan Zhang
af22d050b4 Turn on condition manager v2 in Settings homepage.
Bug: 112485407
Test: rebuild
Change-Id: I5637db9eff4f3121a731685940808260a1cc5a94
2018-08-16 16:18:34 -07:00
Mathew Inwood
63e3a1744a Merge "Add @UnsupportedAppUsage annotations" am: 06f2e6b7c8
am: b95f9ef8ed

Change-Id: Ice1ee09aa09e1fb37be596592aed3b0da2c4b10a
2018-08-16 03:01:23 -07:00
Mathew Inwood
b407568c55 Add @UnsupportedAppUsage annotations
For packages:
  android.util.proto
  android.util.jar
  android.util.apk
  android.util

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I18848448a81132399f6878812acf5031ed8cec9f
Merged-In: Ia0f48c244b0fbe33d40d797702a82303648196ed
2018-08-14 17:32:44 +01:00
Mathew Inwood
4eb56abe8b Add @UnsupportedAppUsage annotations
For packages:
  android.util.proto
  android.util.jar
  android.util.apk
  android.util

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: Ia0f48c244b0fbe33d40d797702a82303648196ed
2018-08-14 17:24:32 +01:00
TreeHugger Robot
0242372fe5 Merge "Add feature flag for condition manager refactoring" 2018-08-13 20:39:47 +00:00
Fan Zhang
c6834b6e3d Add feature flag for condition manager refactoring
Bug: 112485407
Test: rebuild
Change-Id: I8938166c9af0cdf9e5fcd25589c1787093e6ebd8
2018-08-13 12:12:34 -07:00
Josh Gao
ff39377b5c Merge "MemoryIntArray: track the owned file descriptor in a PFD." am: dccbfca194 am: 873c70a8fd am: 1fb65f1798
am: 461fb59073

Change-Id: Ie5c01958466b3ba1612defd0e0a8b7ec79098d1c
2018-08-10 17:19:22 -07:00
Josh Gao
461fb59073 Merge "MemoryIntArray: track the owned file descriptor in a PFD." am: dccbfca194 am: 873c70a8fd
am: 1fb65f1798

Change-Id: I4c4e372f3122cd41b8b6831abf8e215e972dd893
2018-08-10 16:12:41 -07:00
Josh Gao
c81f53f7f1 MemoryIntArray: track the owned file descriptor in a PFD.
AUPT is triggering an fdsan diagnostic when creating a temporary
ParcelFileDescriptor to write to a Parcel. This code seems correct at
first glance, so under the assumption that some other code is closing
the file descriptor out from under us, keep our owned file descriptor
around as a ParcelFileDescriptor to catch the perpetrator in the act.

Bug: http://b/112405224
Test: atest MemoryIntArrayTest
      (testAshmemSizeMatchesMemoryIntArraySize failed/crashed before, fails now)
Change-Id: Ie8ff7562c78ecde4cf1757d572ecb733213cc975
2018-08-09 16:32:42 -07:00
Mathew Inwood
3bbdabce1f Merge "Code formatting change for upcoming annotations." am: 5d669f79f2 am: 5d44cf6f72 am: 37030d9884
am: 2b55fef6b9

Change-Id: I4110c2cb0273dc3eb617bf10687d4f4781ae98aa
2018-08-01 18:20:55 -07:00
Mathew Inwood
2b55fef6b9 Merge "Code formatting change for upcoming annotations." am: 5d669f79f2 am: 5d44cf6f72
am: 37030d9884

Change-Id: I3526cd00cffc1e4857cfda9bab32b0f1a130d55c
2018-08-01 17:28:24 -07:00
Mathew Inwood
5d44cf6f72 Merge "Code formatting change for upcoming annotations."
am: 5d669f79f2

Change-Id: Iffd38fbc5ee5cd01d5900afbfee331e005b860c6
2018-08-01 16:05:35 -07:00
Laura Davis
c49f34dffc Merge "Docs: fixed typo and made minor edits" into pi-dev am: ae3f656146
am: 30e50fdb5d

Change-Id: I5ec12962b74b998a4a9ced35aa2425e314b8b93e
2018-08-01 11:26:54 -07:00
Laura Davis
30e50fdb5d Merge "Docs: fixed typo and made minor edits" into pi-dev
am: ae3f656146

Change-Id: I730596d6577c8dd50aa00f0f43a236e247dc3953
2018-08-01 11:10:46 -07:00
Mathew Inwood
c092f2317b Code formatting change for upcoming annotations.
Putting /** @hide */ on the same line results in the automated annotation
addition putting the annotation the previous line, which then results in
the @hide javadoc annotation being ignored (since it's now no longer
strictly before the method declaration).

Bug: 110868826
Test: m
Change-Id: I1b5c290a17ead46effd2f2ff3f4b33884efbc116
2018-08-01 13:52:03 +01:00
Laura Davis
e27c3511d8 Docs: fixed typo and made minor edits
Test: make ds-docs

Bug: 111734031
Bug: 111734470
Change-Id: Ic120368fef0c0673ce954cdf0927a4705b3edcd2
2018-07-30 14:56:32 -07:00
Paul Duffin
77ad379195 Merge "Remove dependency on InflaterInputStream.closed field." am: 555fc87b99 am: 6565aae0e9 am: bd1579d975
am: 6526a55fc1

Change-Id: I30de71a4a53f61c20da014b28bef6b088cdee83c
2018-07-24 02:58:05 -07:00
Paul Duffin
6565aae0e9 Merge "Remove dependency on InflaterInputStream.closed field."
am: 555fc87b99

Change-Id: I66687ef9b82fb2071e6fc04726d099bc1b5fab65
2018-07-24 02:27:35 -07:00
Tobias Thierer
97c4d13812 Fix Base64OutputStream swallowing/throwing the wrong exception.
Base64OutputStream.close() first write()s (possibly empty) data
and then close()s the underlying stream. Because of an inverted
condition, exceptions thrown by the underlying stream were handled
incorrectly:

 - if both the underlying write() and close()/flush() throw
   then it would throw the latter exception when it should
   have thrown the former, suppressing the latter.
 - if only the underlying close() throws then that exception
   was swallowed when it should have been closed.

This bug existed ever since this file was first added to
Android in commit 9df2ffd420
in Feb 2010 (before the concept of suppressed exceptions
existed/was supported). The buggy code was proposed in a
review comment on that CL, which was then accepted/integrated
into the CL.

This CL fixes the inverted condition and adds test coverage.
It also adds code to add the suppressed exception (if any).

Bug: 111697617
Test: Confirmed that Base64Test fails (as described above) before
  this CL but passes after this CL, when running these commands:
  make FrameworksCoreTests && \
  adb install -r ${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreTests/FrameworksCoreTests.apk && \
  adb shell am instrument -w -e class android.util.Base64Test \
    com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner

  Specifically, before this CL, the following test failures occur:
  1.) junit.framework.AssertionFailedError
	at junit.framework.Assert.fail(Assert.java:48)
	at junit.framework.Assert.fail(Assert.java:56)
	at android.util.Base64Test.testOutputStream_ioExceptionDuringClose(Base64Test.java:546)
  2.) junit.framework.ComparisonFailure: expected:<[writ]e()> but was:<[clos]e()>
	at junit.framework.Assert.assertEquals(Assert.java:85)
	at junit.framework.Assert.assertEquals(Assert.java:91)
	at android.util.Base64Test.testOutputStream_ioExceptionDuringCloseAndWrite(Base64Test.java:574)

Change-Id: If7fd7c4615ca004638d7c5d8f1869e7eddb16f33
2018-07-23 17:30:59 +01:00
Paul Duffin
96a1368158 Remove dependency on InflaterInputStream.closed field.
In upstream OpenJDK the InflaterInputStream.closed field is private.
During integration of OpenJDK into Android it was changed to be
protected so that it could be used by StrictJarFile, and in the process
was accidentally made part of the public API. This change removes the
StrictJarFile dependency on that field.

Bug: 111061052
Test: checkbuild, flash and run FrameworkCoreTests
Change-Id: I8aee1c444cf27e7078b848c65e0433c831ab06a0
2018-07-23 15:55:33 +01:00
Tobias Thierer
6cbe154c9d Merge "Use StrictJarManifest.ATTRIBUTE_NAME_NAME instead of Attributes.Name.NAME." am: 2dc5a42743 am: 597eb7f87e am: d05cdbcccd
am: c9923e3e91

Change-Id: I249f6ab4b2cc94c9598a71249c1a746060ac283c
2018-07-20 10:44:41 -07:00
Tobias Thierer
597eb7f87e Merge "Use StrictJarManifest.ATTRIBUTE_NAME_NAME instead of Attributes.Name.NAME."
am: 2dc5a42743

Change-Id: I5a61fe6e4b9507a754f8977225bc4dbbee88a4ff
2018-07-20 10:11:27 -07:00
Treehugger Robot
2dc5a42743 Merge "Use StrictJarManifest.ATTRIBUTE_NAME_NAME instead of Attributes.Name.NAME." 2018-07-20 15:50:59 +00:00
Tobias Thierer
8a0845e517 Use StrictJarManifest.ATTRIBUTE_NAME_NAME instead of Attributes.Name.NAME.
Introduce a constant StrictJarManifest.ATTRIBUTE_NAME_NAME so that
callers (StrictJarManifest{,Reader}) don't need to rely on
Attributes.Name.NAME which was added via an Android patch.

Bug: 35910877
Test: Treehugger

Change-Id: I292fbefc6c5561609dcd8281d1e2a931a1ffa5b2
2018-07-13 17:29:35 +01:00
Lucas Dupin
401ea1647a Merge "Dark Notification Shade" 2018-07-13 02:09:31 +00:00
Lucas Dupin
f03e752407 Dark Notification Shade
Test: adb shell service call uimode 4 i32 1 # day
Test: adb shell service call uimode 4 i32 2 # night
Bug: 110758454
Change-Id: Ib6fce91d1aeff7e1fbfe8a7a528095487fbdb3f8
2018-07-12 17:30:34 -07:00
Neil Fuller
7add22db60 Merge "Move XML object factory logic to libcore"
am: 8176fb99e1

Change-Id: Ib0940ecb89eaf11841bbd66cdaf1c5379466496c
2018-07-12 11:26:03 -07:00
TreeHugger Robot
f8585dcb50 Merge "Move XML object factory logic to libcore" 2018-07-12 11:20:37 +00:00
Neil Fuller
f4634736ca Move XML object factory logic to libcore
It makes sense to hide the details of the parser implementation
(and other similar objects) in libcore so it could be changed.

This change removes the "ExpatPerformanceTest" which appears not to have
been maintained and was comparing KxmlParser with itself. It is assumed
that android.util.Xml used to return the expat parser.

Test: build
Bug: 111055375
Merged-In: Ibad247323ba90cd949aecb2bd92f2f73306a4327
Change-Id: Ibad247323ba90cd949aecb2bd92f2f73306a4327
2018-07-11 14:02:00 +01:00
Neil Fuller
2f5a6895c5 Move XML object factory logic to libcore
It makes sense to hide the details of the parser implementation
(and other similar objects) in libcore so it could be changed.

This change removes the "ExpatPerformanceTest" which appears not to have
been maintained and was comparing KxmlParser with itself. It is assumed
that android.util.Xml used to return the expat parser.

Test: build
Bug: 111055375
Change-Id: Ibad247323ba90cd949aecb2bd92f2f73306a4327
2018-07-11 13:50:42 +01:00
Neil Fuller
3147288c3b resolve merge conflicts of 7980b19bc8 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ica0d3578c6e3fcd17b350f63b4acd471774ac014
2018-07-06 16:32:44 +01:00
Treehugger Robot
7980b19bc8 Merge "Track changes in libcore to remove a constructor" 2018-07-06 13:58:29 +00:00