352862 Commits

Author SHA1 Message Date
Treehugger Robot
470ba9d471 Merge "Added AIDL for cell identity" 2017-12-28 18:17:34 +00:00
Android Build Merger (Role)
609d5aaa8a Merge "Merge "Fix temporary file name strlcpy size." am: d4d542e0ca am: 02d370c464 am: d74ed9646b" 2017-12-28 18:13:33 +00:00
Adam Lesinski
39ddabf2d0 Merge "AAPT2: Keep file enumeration consistent across platforms" 2017-12-28 18:13:05 +00:00
Ivan Lozano
8a5a366f4e Merge "Fix temporary file name strlcpy size." am: d4d542e0ca am: 02d370c464
am: d74ed9646b

Change-Id: Ia649723ad4a067b41efa5d9182d21beb24ea8276
2017-12-28 18:13:02 +00:00
Ivan Lozano
d74ed9646b Merge "Fix temporary file name strlcpy size." am: d4d542e0ca
am: 02d370c464

Change-Id: If6efd949c11a39c4df2ed753c6b850785f8872e4
2017-12-28 18:06:15 +00:00
Ivan Lozano
02d370c464 Merge "Fix temporary file name strlcpy size."
am: d4d542e0ca

Change-Id: Id9de2553e39a1999ed7e43c3ce5bc18b63fc2221
2017-12-28 17:59:37 +00:00
Ivan Lozano
d4d542e0ca Merge "Fix temporary file name strlcpy size." 2017-12-28 17:48:50 +00:00
Ivan Lozano
6593d714b6 Disable sanitizer entirely in ResourceTypes.cpp
The unsigned integer overflow sanitizer catches an overflow on
Res_GETPACKAGE usages. This is used in a number of places in
ResourceTypes.cpp in a number of large functions. For now, lets disable
the sanitizer in this source file.

Test: Compiles and device boots without runtime errors.
Bug: 30969751
Change-Id: Id9e0776ef819c895a3194a32da5c85459f1af431
Merged-In: Id9e0776ef819c895a3194a32da5c85459f1af431
(cherry picked from commit 02828740da7481a48e7872b22213047025894525)
2017-12-28 09:14:42 -08:00
Adam Lesinski
fca5e427e2 AAPT2: <uses-library /> and <library /> don't need to be Java packages
- Also fixes issue where a failure checking the Java package of an attribute
would yield no error message.

Bug: 70722199
Test: make aapt2_tests
Change-Id: I417d5ffe18c8d4ba2f1638f9fb9ba29278ec8e94
2017-12-28 08:17:51 -08:00
Adam Lesinski
e6aa6d1421 AAPT2: Keep file enumeration consistent across platforms
Filesystem directory enumeration is platform dependent, so
sort the files lexicographically according to source path before
consuming them in the compile command.

Bug: 70680618
Test: manual
Change-Id: I6706dea2eb40cbaff8a586994dd1013976e4ced4
2017-12-28 08:17:43 -08:00
Robert Berry
94ea4e4caf Encode vault params in key sync task
Still not sure how we're getting counter_id here, though?

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ic473fff4a19c1d044a6381a1459eca0835a55697
2017-12-28 15:54:37 +00:00
TreeHugger Robot
4158a67a32 Merge "Fix child windows of windows with surface insets" 2017-12-28 14:26:31 +00:00
Robert Berry
aa3f4cad33 Hook up using initialized public key in KeySyncTask
Not sure if this is correct, PTAL. We won't have a specific uid when
the phone is unlocked, only the userId. Should the public key be
uid-specific or just userId-specific?

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ic2ec442c8a283e747542fafa9d7b0462aa185532
2017-12-28 11:04:42 +00:00
Jack Yu
23192ff57f Added AIDL for cell identity
Added AIDL for CellIdentityCdma, CellIdentityGsm, CellIdentityLte
and CellIdentityWcdma. This is the preliminary change for IWLAN
refactoring as network registration state will be moving into
system API.

Test: Build
bug: 64132030
Merged-In: I6763d4b6e51cf354b01ee5bfb5d37114394f3063
Change-Id: I6763d4b6e51cf354b01ee5bfb5d37114394f3063
(cherry picked from commit 31db18a4c078b77f011170a27eb95c94398efde6)
2017-12-27 23:29:49 -08:00
TreeHugger Robot
7b27036950 Merge changes from topics "wrapped_key_import", "keystore_seclevels"
* changes:
  Add importWrappedKey to IKeystoreService.aidl
  Keystore: Use security levels
2017-12-28 02:16:55 +00:00
TreeHugger Robot
43fce46bcd Merge "Added AIDL for cell identity" 2017-12-28 02:16:20 +00:00
Jack Yu
31db18a4c0 Added AIDL for cell identity
Added AIDL for CellIdentityCdma, CellIdentityGsm, CellIdentityLte
and CellIdentityWcdma. This is the preliminary change for IWLAN
refactoring as network registration state will be moving into
system API.

Test: Build
bug: 64132030
Change-Id: I6763d4b6e51cf354b01ee5bfb5d37114394f3063
2017-12-27 16:19:20 -08:00
Dmitry Dementyev
bdfdf53d08 Implement RecoverableKeyStore API to set/get recovery secret types.
Bug: 66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: If29f22f24438a9d050fabebf970b9ae56b0df805
2017-12-27 15:57:49 -08:00
Kweku Adams
59e6fd792d incidentd: Parsing battery_type data to proto.
Bug: 65750835
Test: atest incident_helper_test
Change-Id: I3afefcfbd68924f8b6bd384cf1c7a41daeb243e3
2017-12-27 15:48:14 -08:00
TreeHugger Robot
6015c07247 Merge "Small fix to addconfig in statsd." 2017-12-27 23:37:20 +00:00
sqian
642a8d2d10 Add ICCID_PREFIX column in CarridId DB
Bug: 64131637
Test: Treehugger runs providers/telephony/CarrierIdProviderTest.java

Change-Id: I0d118ab181dfe17a7976a0b654989a3662594d4a
Merged-In: I0d118ab181dfe17a7976a0b654989a3662594d4a
(cherry picked from commit 4fe8280dc6736ab3c59f8e384323c26212215a90)
2017-12-27 15:28:06 -08:00
TreeHugger Robot
bed44e64e8 Merge "Log only necessary info from usagestats dump on test failure." 2017-12-27 22:47:29 +00:00
TreeHugger Robot
a370128b70 Merge "Trigger recovery agent PendingIntent in KeySyncTask" 2017-12-27 22:38:30 +00:00
Jean-Michel Trivi
d8cb4196f2 NotificationPlayer: fix focus not abandoned on playback error
If an exception is fired when trying to start the MediaPlayer
  after audio focus was requested, it will not be abandoned
  on error or completion.

Bug: 70727414
Test: see bug
Change-Id: Ib2a07499829890a858d5a38d46c3575d2d7b6629
2017-12-27 14:14:37 -08:00
goneil
16bac7483d Merge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions" am: ee48176ad6 am: f220cdfca4
am: 663150a708  -s ours

Change-Id: I6afc251ec22979c349f5255a9c6b297e008818ea
2017-12-27 21:46:43 +00:00
goneil
663150a708 Merge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions" am: ee48176ad6
am: f220cdfca4

Change-Id: Ic809d19c8d5542b8f3a7d2a8b245a4db971165e3
2017-12-27 21:37:28 +00:00
David Chen
7d8aa4ded5 Small fix to addconfig in statsd.
AddConfiguration now returns false if the incoming byte array can't
even be parsed into the expected proto format. Unfortunately, we
can't fully evaluate if this configuration is valid. Still, this
gives the caller a chance to know that the parameters it sent can't
even be parsed.

Test: Tested that statsd still builds.
Change-Id: I7ba7c64adc4bc77549d5e9133e212a4870645786
2017-12-27 13:37:01 -08:00
Malcolm Chen
0998a81f5a Merge "Remove getIntWithSubId in TelephonyManager." am: 10d1ee58f8 am: c7cebc8e8e
am: 0eff354771  -s ours

Change-Id: Idfb1d9169e05461bf534babfde9c991c479a58e8
2017-12-27 21:32:32 +00:00
goneil
f220cdfca4 Merge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions"
am: ee48176ad6

Change-Id: I831efeddbebd4ff65d2a64f628eab84f84ecfa73
2017-12-27 21:31:21 +00:00
Malcolm Chen
0eff354771 Merge "Remove getIntWithSubId in TelephonyManager." am: 10d1ee58f8
am: c7cebc8e8e

Change-Id: I50fdbebe3decd0dad93802fdf8fa722ab7c06d07
2017-12-27 21:24:37 +00:00
Treehugger Robot
ee48176ad6 Merge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions" 2017-12-27 21:22:02 +00:00
Sudheer Shanka
6078c4bece Log only necessary info from usagestats dump on test failure.
Test: atest services/tests/servicestests/src/com/android/server/net/ConnOnActivityStartTest.java
Change-Id: Id0235a56fc9d503ff1b7693866cb800e0ac2bdbb
2017-12-27 13:17:49 -08:00
Malcolm Chen
c7cebc8e8e Merge "Remove getIntWithSubId in TelephonyManager."
am: 10d1ee58f8

Change-Id: I6ddf4fa541650ed9c983bd21d7e3eacf80214285
2017-12-27 21:15:31 +00:00
Treehugger Robot
10d1ee58f8 Merge "Remove getIntWithSubId in TelephonyManager." 2017-12-27 21:06:32 +00:00
TreeHugger Robot
5f79e64eae Merge "Fix "You're using your work profile" toast is shown when launcher is ...in foreground" 2017-12-27 20:42:23 +00:00
Andreas Gampe
267f0f16cd Merge "Binder: Log a histogram of binder proxies to logcat on death" am: 4b7abe301c am: 3c57709e70
am: 906d0c9375

Change-Id: I30960a4d831f420911b287145646be569423fdd0
2017-12-27 20:34:19 +00:00
Andreas Gampe
906d0c9375 Merge "Binder: Log a histogram of binder proxies to logcat on death" am: 4b7abe301c
am: 3c57709e70

Change-Id: I322ced9619f9982182c5b739007988fda89c6f30
2017-12-27 20:24:50 +00:00
Andreas Gampe
3c57709e70 Merge "Binder: Log a histogram of binder proxies to logcat on death"
am: 4b7abe301c

Change-Id: I8f29f452707bb38799877f23d0d04152619c81cb
2017-12-27 20:18:25 +00:00
Treehugger Robot
4b7abe301c Merge "Binder: Log a histogram of binder proxies to logcat on death" 2017-12-27 20:08:25 +00:00
Robert Berry
9104404408 Trigger recovery agent PendingIntent in KeySyncTask
Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Iafae3ff7da9bdc9e986cd19cde72170f9f438180
2017-12-27 20:02:19 +00:00
TreeHugger Robot
23ee77035d Merge "Add storage for snapshots in KeySyncTask" 2017-12-27 19:08:32 +00:00
Eugene Susla
cb37da8b13 Merge "Add a 'unbounded method refs only' clause to PooledLambda javadoc" 2017-12-27 18:17:23 +00:00
Andreas Gampe
3fc030f083 Binder: Log a histogram of binder proxies to logcat on death
To help investigate potential BinderProxy leaks, attempt to log a
histogram of BinderProxy descriptors to the logcat before asserting.

Bug: 71353150
Test: m
Change-Id: I47313814160678369b15e7dc5851d8096c286b9d
2017-12-27 09:30:45 -08:00
Jorim Jaggi
50d3f8f407 Fix child windows of windows with surface insets
We need to undo the outsetting when positioning the child.

Test: Open Dialog, enter text, select text, make sure handle is
positioned correctly
Fixes: 70777791

Change-Id: Ia64e25122499782c977a6ab45113481fd2d9f965
2017-12-27 17:41:25 +01:00
Narayan Kamath
80434a7bed WorkSource: Update serialization to worksource.proto.
Now includes WorkChains.

Bug: 62390666
Test: manual
Change-Id: Idf3f9f3df86fb51ebcc938d7feb891789e16b68a
2017-12-27 15:44:17 +00:00
chaviw
2301211526 Set crop and final crop for WindowAnimation
Added crop and final crop to WindowAnimation depending on clip mode.

Test: 1. Enter split screen by dragging app from recents.
      2. In split screen, open new activities in primary window.
      3. Lock screen and unlock while in split screen

Change-Id: Idc4055de8c2c9aaa449f6387097c1970ef1d94fa
2017-12-27 15:49:55 +01:00
Jorim Jaggi
619c9f7c5c Handle z-layering in animation layer
We use the prefix order to determine base layer within the
animation layer. This ensure that for the animation windows, the
z-ordering during animations doesn't change.

We then boost anything that needs a z-boost to 800570000 + prefix
order, such order within the boosted layers is preserved as well.

Also fix an issue where the thumbnail wasn't attached to the
animation layer.

Test: WindowContainerTests
Test: go/wm-smoke
Bug: 64674361
Change-Id: If5909bd87a12f1d8920c7232acab0f3d17be0f6c
2017-12-27 15:49:55 +01:00
chaviw
23ee71c8c2 Set initial position for WindowAnimation and reparent animation leash.
1. Set the initial position for the WindowAnimationSpec to be the stack
position.
2. Reparent the animation leash to mAnimationLayer
3. Updated Surface names for clarity.

Test: Opening apps animate from the correct start location. When apps
are animating, their layers are reparented to the correct animation
layer.

Change-Id: I3e3a1e45f0a0cf9d471dee105abd9bce05d1e91d
2017-12-27 15:49:55 +01:00
chaviw
e07246ad7b Set stack size and position and update children surface position.
Update the stack's size and position to represent the bounds. Then
update all children's positions so they are in the correct place within
the stack's bounds.

Test: Split screen, pip
Change-Id: I0372a8d20407ec35d1e8c0fc8165253f68d2f18f
2017-12-27 15:49:55 +01:00
Jorim Jaggi
2d74fafdaf Fix starting of animations
We need to manually process the first animation frame as
mStartTime of ValueAnimator would only be set when processing
the next animation frame.

Test: go/wm-smoke
Test: Add some additional tracing about current playing time and
observe no delay.
Bug: 64674361
Change-Id: Iad753bfb7b86cfd57f265b5084a3d24f967dcaf3
2017-12-27 15:49:55 +01:00