Commit Graph

301953 Commits

Author SHA1 Message Date
Dheeraj Shetty
a62a1302ee DO NOT MERGE API for reporting IMS registration failures
Draft API to report registration failures in the following
scenarios:
1. Idle mode failures - new IMS registration.
2. Ims registration handover failures - Handover of IMS registration
   from one access technology to another.

Bug: 33430556
Change-Id: Ie3bafec41c0198a66aa3ebca660a2a060e511c39
2016-12-07 16:09:47 -08:00
Hugo Benichi
95b5723830 Merge "Removing bogus file added by mistake" 2016-12-08 00:04:52 +00:00
Jorim Jaggi
86ad8bb47b Merge "Fix issue when starting FLAG_DISMISS_KEYGUARD while occluded" 2016-12-08 00:00:04 +00:00
Selim Cinek
0e39fac360 Fixed the scrim drawing in seascape
The scrim was drawing offset in seascape leading to artifacts.

Test: add notifications, observe seascape drawing, no artifacts
Bug: 32437839
Change-Id: I63d9f680a62212873a01fb947193f7cece19d81c
2016-12-07 15:58:07 -08:00
Selim Cinek
932005db01 Placed the overflow indicator perfectly in the collapsed center
Previously, the state could be abitrary based on the width of the layout
this is now fixed.

Test: add high, low-priority notifications, observe perfect centering
Bug: 32437839
Change-Id: Id82d4aa87fe07f53bfe1b891a1ce2caa88d686dc
2016-12-07 15:58:06 -08:00
Selim Cinek
17e1b69523 Improved the low priority behavior with the shelf
Low priority notification now don't just disappear,
but transform into an overflow such that there's still
some object permanence.

Test: add low-priority notifications, see dot transformation
Bug: 32437839
Change-Id: I90c03c7d88c01c199062bd5f7f0151629654a3a1
2016-12-07 15:58:06 -08:00
Selim Cinek
65d418ec89 Improved the performance of the notification shelf
The shelf had a few inefficiencies that were adding up
when calculating the positions.

Test: runtest systemui-jank -c android.platform.systemui.tests.jank.SystemUiJankTests -m testNotificationListPull_manyNotifications
Bug: 32437839
Change-Id: Iac08a7c364a924f1d0c14258461383b431f0542b
2016-12-07 15:57:44 -08:00
Amin Shaikh
972e236e84 Support multiple caches in NetworkScoreService.
- Use RemoteCallbackList for managing multiple callbacks
- Add unregisterNetworkScoreCache to the service interface
- Added NetworkScoreServiceTest

Test: runtest frameworks-services

Bug: 32913019
Change-Id: I16ca1682acca9cbe403812e520394688a026414b
2016-12-07 15:52:33 -08:00
Adrian Roos
72abcdaec7 EmergencyCryptkeeperText: Make sure we update if airplane mode changes
Fixes a race condition that could case the emergency text
to show when it should not, if airplane mode was queried
before it was set by the radio layer.

Change-Id: I146f2877e300d105d8a53af130be46b02ec965b2
Test: Boot into cryptkeeper with a SIM, verify that it does not show 'Emergency Calls Only' until emergency call is initiated.
Fixes: 33278862
Fixes: 32063642
2016-12-07 23:47:32 +00:00
Stephen Chen
4aef203cb8 Merge "Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED." am: faf3aa697f am: fe9a20c980 am: 609711bbd5
am: 357483f41e

Change-Id: I4cb930396651b86d9a786b9b0abe807c300cd526
2016-12-07 23:33:49 +00:00
Svetoslav Ganov
cad7eb9c93 Don't accidentally delete renamed packages
Apps on the system image can change their package by declaring
their old one in the manifest. If a package is renamed it is
internally referred by its old name.

The reconciliation code was using the new package name for
renamed packages and was concluding the apk is orphaned thus
deleting it. This puts the package in a bad state where the app
is gone and the version on the system partition is disabled.

Also Play was showing an update for a renamed system app as
an install while it is an update because of the same reason,
it was using the new package name while the app is internally
referred by the old one.

The fix for both above is to internally normalize the package
name by using the old one if the package was renamed or the
package name as is.

Test: With the fix put the old calculator on the system image
and booted, then put the renamed calculator and booted, updated
calculator from play and rebooted - calculator keeps working.
Also did the above steps without the patch to put calculator
in a bad state and flashed the system with the patch which
fixed the broken calculator app.

bug:32321269

Change-Id: I98bfc05c399edfc9854ebcce44182fefa55ceeff
(cherry picked from commit e2c85890ac)
2016-12-07 23:32:03 +00:00
Stephen Chen
357483f41e Merge "Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED." am: faf3aa697f am: fe9a20c980
am: 609711bbd5

Change-Id: I11634693f1088319c90e291d78edbc8e10cd147a
2016-12-07 23:25:46 +00:00
Winson Chung
b5c41b7868 Adding ability for an app to request auto-enter picture-in-picture.
- If an activity requests that it can auto-enter PIP, then we will trigger
  it to enter PIP when the task is effectively being occluded.  This does
  not affect the activity when the screen is locking, or if it starts new
  activities within its own task, or if it finishes itself, or if there is
  already a PIP activity.
- Changed setPictureInPictureAspectRatio to also specify the aspect ratio
  to use when auto-entering PIP.  If the activity is not PIP'ed and has
  not requested auto-enter, then the call continues to fail.

Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testAutoEnterPictureInPicture
Test: #testAutoEnterPictureInPictureLaunchActivity
Test: #testAutoEnterPictureInPictureFinish
Test: #testAutoEnterPictureInPictureAspectRatio
Test: #testAutoEnterPictureInPictureOverPip

Change-Id: I6477b6d1f160cf0219d935123bbb505f57ee7a56
2016-12-07 15:21:50 -08:00
Michael Plass
f47437fd8b Merge "Remove user-triggered disconnect counters" am: 2007ee8de3 am: b8d3324bb7 am: 2c106012fe
am: 88f6752547

Change-Id: Ie2d0a341db570e2fb807da3b8ff7a049c055c49f
2016-12-07 23:21:49 +00:00
Winson Chung
e630804797 Only allowed visible, non-stopped activities to enter PIP.
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testDisallowPipLaunchFromStoppedActivity

Change-Id: Ieb11345f09019bc83d6aaf92acbc3fb986d9ec43
2016-12-07 15:20:48 -08:00
Svetoslav Ganov
86dfa094de Fix vulnerability in MemoryIntArray
MemoryIntArray was using the size of the undelying
ashmem region to mmap the data but the ashmem size
can be changed until the former is memory mapped.
Since we use the ashmem region size for boundary
checking and memory unmapping if it does not match
the size used while mapping an attacker can force
the system to unmap memory or to access undefined
memory and crash.

Also we were passing the memory address where the
ashmem region is mapped in the owner process to
support cases where the client can pass back the
MemoryIntArray instance. This allows an attacker
to put invalid address and cause arbitrary memory
to be freed.

Now we no longer support passing back the instance
to the owner process (the passed back instance is
read only), so no need to pass the memory adress
of the owner's mapping, thus not allowing freeing
arbitrary memory.

Further, we now check the memory mapped size against
the size of the underlying ashmem region after we do
the memory mapping (to fix the ahsmem size) and if
an attacker changed the size under us we throw.

Tests: Updated the tests and they pass.

bug:33039926
bug:33042690

Change-Id: Ie267646eb88014034fbd048d7a9bc273420c7eff
2016-12-07 15:19:13 -08:00
Stephen Chen
609711bbd5 Merge "Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED." am: faf3aa697f
am: fe9a20c980

Change-Id: I7bba392e349525dd55bb8b251554e81967424136
2016-12-07 23:18:15 +00:00
Adrian Roos
4ac8f40d96 MessagingStyle: Fix buggy measure in MessagingLinearLayout
Fixes a bug in MessagingLinearLayout where we would not
recompute the height of it after applying the computed
insets to the text views, leading to incorrect padding
and in rare cases a cut off message at the bottom.

Change-Id: If87a527555158e94e501832e9f49e380cc7da2bb
Test: runtest -x core/tests/coretests/src/com/android/internal/widget/MessagingLinearLayoutTest.java
Fixes: 31463075
2016-12-07 15:16:19 -08:00
Michael Plass
88f6752547 Merge "Remove user-triggered disconnect counters" am: 2007ee8de3 am: b8d3324bb7
am: 2c106012fe

Change-Id: Ic89ec00cbf94ca3da131d4aff3bc9df04fc1b4be
2016-12-07 23:15:28 +00:00
Lei Yu
e54702950a Merge "Remove hardcode color in styles.xml" 2016-12-07 23:14:07 +00:00
Stephen Chen
fe9a20c980 Merge "Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED."
am: faf3aa697f

Change-Id: Ib43452b0f819c12ec51402151e272ad190fd8362
2016-12-07 23:13:40 +00:00
Michael Plass
2c106012fe Merge "Remove user-triggered disconnect counters" am: 2007ee8de3
am: b8d3324bb7

Change-Id: Iaf564f5428e3d91773bb0bd6743340f55dd192db
2016-12-07 23:10:55 +00:00
Jeff Sharkey
17e9b4be46 Merge "Yet another set of installd Binder methods." am: c69b210ec8 am: e5617f5d16 am: 75bede2227
am: f7a57d613d

Change-Id: I16e412c92eb87728c512c39b2c197b5c6d6179e5
2016-12-07 23:06:00 +00:00
Michael Plass
b8d3324bb7 Merge "Remove user-triggered disconnect counters"
am: 2007ee8de3

Change-Id: I6033a4cb4cdfe21f04ced289ce17e7b3bc734c65
2016-12-07 23:05:29 +00:00
Lei Yu
dbf6b26d75 Merge "Add tint for icons in volume dialog" 2016-12-07 23:01:59 +00:00
Treehugger Robot
faf3aa697f Merge "Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED." 2016-12-07 23:00:26 +00:00
Jeff Sharkey
f7a57d613d Merge "Yet another set of installd Binder methods." am: c69b210ec8 am: e5617f5d16
am: 75bede2227

Change-Id: Idf12305c995772340d3f9fbbd5eb299f3f05a19a
2016-12-07 23:00:00 +00:00
Michael Plass
2007ee8de3 Merge "Remove user-triggered disconnect counters" 2016-12-07 22:56:58 +00:00
Jeff Sharkey
75bede2227 Merge "Yet another set of installd Binder methods." am: c69b210ec8
am: e5617f5d16

Change-Id: I967af3436f4ab66663bddbadf07561c4a7411b38
2016-12-07 22:53:10 +00:00
Jeff Sharkey
e5617f5d16 Merge "Yet another set of installd Binder methods."
am: c69b210ec8

Change-Id: Iee5ff3acffcf3f26cbf964430952f447c117958f
2016-12-07 22:47:46 +00:00
Svetoslav Ganov
74c9983e80 Fix vulnerability in MemoryIntArray
MemoryIntArray was using the size of the undelying
ashmem region to mmap the data but the ashmem size
can be changed until the former is memory mapped.
Since we use the ashmem region size for boundary
checking and memory unmapping if it does not match
the size used while mapping an attacker can force
the system to unmap memory or to access undefined
memory and crash.

Also we were passing the memory address where the
ashmem region is mapped in the owner process to
support cases where the client can pass back the
MemoryIntArray instance. This allows an attacker
to put invalid address and cause arbitrary memory
to be freed.

Now we no longer support passing back the instance
to the owner process (the passed back instance is
read only), so no need to pass the memory adress
of the owner's mapping, thus not allowing freeing
arbitrary memory.

Further, we now check the memory mapped size against
the size of the underlying ashmem region after we do
the memory mapping (to fix the ahsmem size) and if
an attacker changed the size under us we throw.

Tests: Updated the tests and they pass.

bug:33039926
bug:33042690

Change-Id: Ib8e50afcdb5475123968572ac9696e8ed4031631
2016-12-07 22:43:56 +00:00
Jeff Sharkey
c69b210ec8 Merge "Yet another set of installd Binder methods." 2016-12-07 22:38:48 +00:00
TreeHugger Robot
713f913c44 Merge "Don't allow IME windows to be IME targets" 2016-12-07 22:32:03 +00:00
TreeHugger Robot
5ea27f6cf9 Merge "Make "Drag failed" animation comply with Material Design" 2016-12-07 22:26:18 +00:00
TreeHugger Robot
e5e0a85ef3 Merge "Fix slow exit transition left exited views INVISIBLE." 2016-12-07 22:22:48 +00:00
Jeff Sharkey
99840df1e2 Merge "Move dump() to dumpAsync(), more oneway calls." am: fedf0503be am: 00334135d2 -s ours am: 12f53d6b5b -s ours
am: 6aacf73fd2  -s ours

Change-Id: I455f274764b1044fd1816d0103e77165a99ff6e6
2016-12-07 22:13:18 +00:00
Tyler Gunn
ec5b6e3232 Add carrier configuration options to allow enforcing max conference size.
Adding carrier config options to to allow enforcing a maxmimum size for
IMS conferences.
Also adding small performance enhancement to setConferenceables so that
if the list of conferenceable connections does not change it does not
send an update to listeners.

Test: Manual
Bug: 29548224
Change-Id: I109c91c4147814547bb75003d312d81d41a52c13
2016-12-07 14:12:33 -08:00
Jeff Sharkey
6aacf73fd2 Merge "Move dump() to dumpAsync(), more oneway calls." am: fedf0503be am: 00334135d2 -s ours
am: 12f53d6b5b  -s ours

Change-Id: Iab5af99a29ecb118e1717b3dae7ed6b4bb9d320d
2016-12-07 22:09:22 +00:00
Evan Rosky
bb8a81839e Merge "Add support for a custom left affordance icon" 2016-12-07 22:05:28 +00:00
Jeff Sharkey
12f53d6b5b Merge "Move dump() to dumpAsync(), more oneway calls." am: fedf0503be
am: 00334135d2  -s ours

Change-Id: I902dfde05540141a8150ddb260caa24882a7c1a7
2016-12-07 22:01:04 +00:00
Jeff Sharkey
00334135d2 Merge "Move dump() to dumpAsync(), more oneway calls."
am: fedf0503be

Change-Id: I934aa7acbeb4929bfe87e5ade0b960daa3cc88ae
2016-12-07 21:52:45 +00:00
Treehugger Robot
fedf0503be Merge "Move dump() to dumpAsync(), more oneway calls." 2016-12-07 21:43:24 +00:00
Ned Burns
b5da1e29e8 DO NOT MERGE Fix android:noHistory for Wear am: d7a313fb11 am: 6a860f7f3b
am: a872ce0c59  -s ours

Change-Id: I326b0a6f8995c12c1350ee179c1f1f951c93818c
2016-12-07 21:31:06 +00:00
Ned Burns
0ee7d00dc1 DO NOT MERGE Fix android:noHistory for Wear am: d7a313fb11 am: 5207e1cff1
am: 3dc8814e04  -s ours

Change-Id: I149a8cc8b1f380093cc4668f6c9a338e64dd7776
2016-12-07 21:28:11 +00:00
Eric Laurent
a7214b9ad1 Merge "AudioService: fix mismatch in device volume index for alias streams" into nyc-mr2-dev am: a33630fbbe
am: 6f174ed4b1

Change-Id: Icdc271babeeab7d68cc4aa98d216bd3ef188f128
2016-12-07 21:27:11 +00:00
Eric Laurent
8c4baf907d AudioService: fix mismatch in device volume index for alias streams am: 825a5ea380
am: c6729478b1

Change-Id: Ib6f92a9d983dd6aabf9bddf206d24972e1899601
2016-12-07 21:26:11 +00:00
Joe Onorato
fb9f736a3c ProtoOutputStream convenience methods.
- Add a set of write methods to ProtoOutputStream that figure out the type.
  The other methods are doing all the type checking anyway, so this won't be
  much slower, and it's way easier to use.  The expected java type casts
  that people would do anyway happen inside.
- Add writeObject and writeRepeatedObject methods that write a pre-encoded
  object.
- Add a constructor that takes an OutputStream, and a flush() method.  Right
  now, all the data gets flushed at the end, but given this API it would be
  possible to write smaller chunks at the object boundaries and do more
  sophisticated buffering.

Test: CTS
Change-Id: Ieb852092d3d65812c81139558151de9e3f467dc8
2016-12-07 13:24:54 -08:00
Joe Onorato
b38ac0b15d Give protoc-gen-javastream the ability to output multiple java files.
If there are file-level enums, it still will generate what would have
otherwise been the outer class to hold them, since enums don't get
their own class in the streaming proto scheme.

Make the proto apis not @TestApi for now -- there's too much churn.

Test: make
Change-Id: I01fb7dca935261775efe2573ee009df4d0b07fd0
2016-12-07 13:24:54 -08:00
Ned Burns
a872ce0c59 DO NOT MERGE Fix android:noHistory for Wear am: d7a313fb11
am: 6a860f7f3b

Change-Id: I0757bad9e74f79ad3e355feb0dcbfb698e41b7df
2016-12-07 21:23:04 +00:00
Ned Burns
3dc8814e04 DO NOT MERGE Fix android:noHistory for Wear am: d7a313fb11
am: 5207e1cff1

Change-Id: Ie5ed01b9161da8ecf0e6b4ec92be71e941cc966c
2016-12-07 21:20:15 +00:00