18642 Commits

Author SHA1 Message Date
TreeHugger Robot
702b491903 Merge "Add MessagingStyle#isGroupConversation()." 2017-12-20 17:20:27 +00:00
Adrian Roos
4e937c0557 Merge "Display Cutout: Make API public" 2017-12-20 16:33:20 +00:00
TreeHugger Robot
df392c9a1d Merge "Deprecate StaticLayout and DynamicLayout constructors" 2017-12-20 11:58:32 +00:00
TreeHugger Robot
a82824272c Merge "DPM: Implement installing certificates for generated keys" 2017-12-20 08:43:56 +00:00
TreeHugger Robot
cfc57b6fc6 Merge "Make TelephonyManager#getNai() public" 2017-12-20 00:36:33 +00:00
Kodlee Yin
9ac617c5a2 Add MessagingStyle#isGroupConversation().
This will allow apps to mark a Notification's MessagingStyle as a group
conversation. This is useful because the current implementation
overloads MessagingStyle#conversationTitle; which, when not null,
implies a group conversation. Instead of relying on this implicit
contract, we include this change's explicit field.

Test: runtest -x
core/tests/coretests/src/android/app/NotificationTest.java
Bug: 67717177
Bug: 70725009

Change-Id: I5405b6b0ca9723a06113482c04b8c2f8e1a4318c
2017-12-19 14:56:18 -08:00
TreeHugger Robot
6348ddcd04 Merge "Make TOP_SLEEPING procstate more like a cached process." 2017-12-19 18:47:19 +00:00
Arthur Ishiguro
c2b5e3dcd1 Merge "Modify ContextHubInfo to implement Parcelable" 2017-12-19 18:41:23 +00:00
Richard Ledley
beef470baf Merge "Add entity types to Options." 2017-12-19 17:14:27 +00:00
Clara Bayarri
81a4f2e89d Deprecate StaticLayout and DynamicLayout constructors
The Builders should be used instead.
Also remove a StaticLayout constructor only used in tests in favor
of the Builder.

Bug: 64985428
Test: adb shell am instrument -w -e class android.text.StaticLayoutTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ief6839d2c6bb0969bdeb30359eae00d38a2bdb09
2017-12-19 16:46:56 +00:00
Richard Ledley
db18a578f1 Add entity types to Options.
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug: b/67629726
Change-Id: I9cad0159ab539a71d9f504019ebe91fe18206d60
2017-12-19 14:42:52 +00:00
Adrian Roos
d07bafda2e Display Cutout: Make API public
Bug: 65689439
Test: make update-api
Change-Id: I01e73eea819f0b79eea103d7c895265c38f8ff31
2017-12-19 15:29:14 +01:00
Paul Duffin
187a48de62 Remove non-junit android.test.base classes from android.jar
This removes those android.test.** classes which are part of the
android.test.base stubs jar from the main android.jar.

The junit classes will be removed at a later date. It cannot be done at
the moment because it requires a lot of changes to the build files.

This change is being done now rather than wait until they can all be
removed together because the code base is a moving target. Doing this
change minimizes the window during which other developers could either
revert the previous changes that make this possible or add new code that
relies on the android.test.base classes being in android.jar and so
would require yet more changes.

Bug: 30188076
Test: make checkbuild
Change-Id: I9a4df968835166cc3d30c076ef3036711dfe5b7f
2017-12-19 10:42:28 +00:00
TreeHugger Robot
8ca1e41a0f Merge "Make WebView data directory configurable." 2017-12-19 10:06:29 +00:00
Dianne Hackborn
bad8d91056 Make TOP_SLEEPING procstate more like a cached process.
When an app is on the top of the activity stack but the screen
is not on, this doesn't really count as a top app in the normal
sense.  In particular, we'd really like to apply the normal
restrictions we have on background and cached apps: no network
access, no ability to use wake locks, etc.  (In other words, in
this state the app's activity is stopped, so from its perspective
it is no different than the user leaving it to go to another app.)

To do this, we change the order of the TOP_SLEEPING proc state
out from the range of foreground states down to between the
cached and background states.

Test: ActivityManagerProcessStateTest
Bug: 70808931
Change-Id: I994caba8c27553a452de75efa358be0e683d046f
2017-12-18 17:05:52 -08:00
Benedict Wong
ebf59a8962 Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: d0ac50bcad am: 8caa274ade
am: 9de5c77303

Change-Id: I4140f386687c579044f9b5fe59dd7e05f86000fe
2017-12-19 00:41:55 +00:00
TreeHugger Robot
4316d8ecde Merge "Move heavy-weight process state down to cached range." 2017-12-19 00:29:31 +00:00
Ying Xu
2438977f27 Merge "Add new key KEY_CARRIER_CONFIG_OVERRIDE_BOOL" am: 7be7d422a2 am: 784a690ec7
am: 74ee537cca

Change-Id: I35d6ac35a2244cbfcf69cec2da4cd71e721e5e6b
2017-12-18 23:51:01 +00:00
Benedict Wong
d0ac50bcad Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" 2017-12-18 23:50:52 +00:00
Hugo Benichi
c5212b6654 Merge changes I798d8fec,I4a2d5866
* changes:
  MacAddress: address api review comments
  Expose the MacAddress class in the api
2017-12-18 23:43:06 +00:00
Ying Xu
7be7d422a2 Merge "Add new key KEY_CARRIER_CONFIG_OVERRIDE_BOOL" 2017-12-18 23:26:25 +00:00
Dianne Hackborn
f097d42f0c Move heavy-weight process state down to cached range.
This allows us to generally treat heavy-weight processes in
the background as cached processes, applying all of the limitations
we want for such things -- disable wake locks, etc.

Test: run-am-test ActivityManagerProcessStateTest
Bug: 63937884
Change-Id: I7c140c8f48188f6aa9c09731e83e3db4e4405e77
2017-12-18 14:54:08 -08:00
TreeHugger Robot
679436ad60 Merge "Add isMobileDataEnabled in TelephonyManager." 2017-12-18 22:08:38 +00:00
Benedict Wong
babe5d7364 [ipsec-qtaguid] Tag sockets upon creation of encap sockets
Added calls to tag encap sockets to that of the UID for which the encap
socket is being created on behalf of. This ensures that all data
accounting generated for the UDP-encap-ESP socket is correctly billed to
the right UID.

Bug: 62994731
Test: New tests added to IpSecServiceTest.java, passing
Change-Id: I15365ea9c982fd7b4e3cdeff314ddfba2289c86e
2017-12-18 19:46:06 +00:00
Jeff Sharkey
a4239cf798 [CHERRY-PICK] API for apps to tag sockets with their own UID.
This enables app A to create a socket, pass it to app B, and have
app B accept blame for the traffic performed on that socket.

Also adds helpful public APIs for tagging raw FileDescriptor sockets
instead of making developers go through shady SocketImpl wrappers.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AppSecurityTests#testAppFailAccessPrivateData
Bug: 63932076
Change-Id: I08925c843974675fc82e4080cec2eaab9ab7cd41
Merged-In: I08925c843974675fc82e4080cec2eaab9ab7cd41
(cherry picked from commit 70dc4f4d16082c598cd1774d366c1e60c2016126)
2017-12-18 19:44:40 +00:00
Treehugger Robot
fbd4ea125f Merge "Publish Bluetooth HID Device Profile Service API" 2017-12-18 17:47:35 +00:00
Felipe Leme
f1141c0041 Removed Parcelable from FieldClassification.
Test: atest CtsAutoFillServiceTestCases:FieldsClassificationTest

Bug: 70407264

Change-Id: I667bb15e2341a926cdf35e928261bd5fa474a22b
2017-12-18 09:38:51 -08:00
Victor Chang
6d3348451a Merge "API updated for ICU4J 60.1" 2017-12-18 14:57:47 +00:00
Eran Messeri
ecf0f22e58 DPM: Implement installing certificates for generated keys
Add a new method in the DevicePolicyManager to associate certificates (and
set the user-visibility) with a given key alias.
Conceptually, the new method, setKeyPairCertificate is very similar to
installKeyPair, except it does not install a key, only certificates.

(The new setKeyPairCertificate, together with generateKeyPair is
functionally equivalent to installKeyPair, except the keys are generated
in hardware rather than supplied externally).

Bug: 63388672
Test: cts-tradefed run commandAndExit cts-dev -a armeabi-v7a -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement -l DEBUG
Change-Id: Idbfe151f6e5311766decbc1a010bff78dc60249f
2017-12-18 13:26:01 +00:00
Hugo Benichi
a0ecf38d30 MacAddress: address api review comments
1) toSafeString() is renamed to toOuiString()
2) toOuiString() returns a String that only contains the first 3 bytes
   of the mac address.

Bug: 70336442
Test: runtest frameworks-net
Change-Id: I798d8fec32dbff5687a682028e5d90eb941f81c1
2017-12-18 09:22:47 +09:00
Hugo Benichi
3f4848102c Expose the MacAddress class in the api
Test: built,  flashed, $ runtest frameworks-net
Bug: 69390696
Change-Id: Ica5efdf5ffe8ad2500a87f574508a2bcd074b33d
Merged-In: Ica5efdf5ffe8ad2500a87f574508a2bcd074b33d

(cherry picked from commit d411cf61ed5b948aaf6f6234217d6c6999c35159)
2017-12-18 09:21:26 +09:00
TreeHugger Robot
216da5dc44 Merge "Made Autofill Field Classification API public and documented it." 2017-12-16 00:57:50 +00:00
goneil
42722c68cd Make TelephonyManager#getNai() public
Bug: 67750905
Test: android.telephony.cts.TelephonyManagerTest#testTelephonyManager
Change-Id: I92af07a5ed2abd852ff0f79909c574d78b89f535
2017-12-15 16:52:03 -08:00
Hansong Zhang
88f3891d1e Publish Bluetooth HID Device Profile Service API
Enable the BluetoothHidDevice API in framework.

Bug: 63384609
Test: SL4A HID test; test with apps using BluetoothHidDevice
Merged-In: I52ca4674f11179f865bdff22e0289dfe893c40f5
Change-Id: I52ca4674f11179f865bdff22e0289dfe893c40f5
(cherry picked from commit 7bb587d72b8bb5ba8bd2d7530dbd89b4faac289f)
2017-12-15 16:12:00 -08:00
TreeHugger Robot
6831a2646f Merge "Adds API for apps to push events to statsd." 2017-12-16 00:03:53 +00:00
TreeHugger Robot
73617b0cc0 Merge "Add hints for toggles in Slice" 2017-12-16 00:00:26 +00:00
Arthur Ishiguro
9f22dd5857 Modify ContextHubInfo to implement Parcelable
Needed to resolve Java compilation errors when using e.g.
List<ContextHubInfo> in AIDL. Doesn't add the "final" qualifier,
since make will throw errors due to compatibility issues.

Bug: 67734082
Test: make update-api && make
Change-Id: Ie7f99a41eab70455b1c4e86b673e7377be667dfb
2017-12-15 11:50:36 -08:00
Jason Monk
1d521a54bf Merge "Add APIs for slice pinning" 2017-12-15 19:49:02 +00:00
Hansong Zhang
e67de60fc0 Merge "Publish Bluetooth HID Device Profile Service API" 2017-12-15 19:26:11 +00:00
yinxu
0d56f3c8cc Add new key KEY_CARRIER_CONFIG_OVERRIDE_BOOL
When user gets the carrier config bundle, the value of this new key in
the bundle will indicate whether this bundle contains the default config
or carrier specific config.

Bug: 70400384
Test: Basic telephony sanity
Change-Id: I3480665398ad2b7517b71e808c3e4242d113ea46
2017-12-15 11:25:10 -08:00
Neil Fuller
63ae028ae0 Merge "Track API changes in libcore" 2017-12-15 16:03:45 +00:00
Pavel Grafov
d1319bb059 Merge "Introduce DISALLOW_UNIFIED_PASSWORD." 2017-12-15 13:47:55 +00:00
Tobias Thierer
833aa452a8 Merge "Track removal of android.system.Os.{sendfile,waitpid}." 2017-12-15 13:45:12 +00:00
Neil Fuller
d19c0de0df Track API changes in libcore
Bug: 35910877
Test: Build
(cherry picked from commit 12a747e656be08e208d44f6313d242436d5973ca)
Merged-In: Ia2e966e55d7a6d4d190e77af3af6a568e2ab5dee
Change-Id: Ia2e966e55d7a6d4d190e77af3af6a568e2ab5dee
2017-12-15 11:43:19 +00:00
Paul Duffin
1895f2e5bb Remove non-junit android.test.runner classes from android.jar
This removes those android.test.** classes which are part of the
android.test.runner stubs jar from the main android.jar.

The junit classes will be removed at a later date. It cannot be done at
the moment because it requires a lot of changes to the build files.

This change is being done now rather than wait until they can all be
removed together because the code base is a moving target. Doing this
change minimizes the window during which other developers could either
revert the previous changes that make this possible or add new code that
relies on the android.test.runner classes being in android.jar and so
would require yet more changes.

Bug: 30188076
Test: make checkbuild
Change-Id: I4e3c3bfea77ce15ca7a9ba7d36aee5396f67affb
2017-12-15 07:34:47 +00:00
Hansong Zhang
7bb587d72b Publish Bluetooth HID Device Profile Service API
Enable the BluetoothHidDevice API in framework.

Bug: 63384609
Test: SL4A HID test; test with apps using BluetoothHidDevice
Change-Id: I52ca4674f11179f865bdff22e0289dfe893c40f5
2017-12-14 20:06:12 -08:00
Felipe Leme
78172e70f4 Made Autofill Field Classification API public and documented it.
Test: mmm frameworks/base/:doc-comment-check-docs
Test: atest FrameworksCoreTests:SettingsBackupTest
Test: m -j 100 update-api

Fixes: 67867469

Change-Id: Iedf56a2bbcde3826eb22f5ed7a96d6ed70b968f4
2017-12-14 19:48:26 -08:00
David Chen
0a368b2c39 Adds API for apps to push events to statsd.
This API allows app to construct custom metrics based on labels
chosen by the app developers. Also added some buttons to manually
test this functionality in the dogfood app.

Test: Verified that Android can be built and tested with custom app.
Bug: 69522276
Change-Id: Ifb7abea4c1d62fb435a9cb6f32df12bc2234d82f
2017-12-14 16:19:29 -08:00
Android Build Merger (Role)
b669be1dcc Merge "Merge "Use consistent naming for allocating SPI." am: bf48afea49 am: 4753ed4b1b am: f71c95dfe4" 2017-12-14 21:50:52 +00:00
Mady Mellor
414ad18358 Merge "Adds hint summary to slice" 2017-12-14 21:48:59 +00:00