Commit Graph

8711 Commits

Author SHA1 Message Date
Adrian Roos
8406ea9c7b Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e am: 80c470bd52
am: ddaa2e1fec

* commit 'ddaa2e1fec45287f7099120f0b6e75aed9e4c10d':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: Iaea682e2a45c35d9114466d010c98c120e8847c9
2016-05-23 23:38:16 +00:00
Adrian Roos
ddaa2e1fec Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e
am: 80c470bd52

* commit '80c470bd52af8b5db26cc0aae24da10135883c0d':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I9a4309d22dbc58081387771ec228c32e2db2cf84
2016-05-23 23:23:40 +00:00
Adrian Roos
80c470bd52 Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev
am: d15cc7a83e

* commit 'd15cc7a83e8d6251d4cf78bb08ee26b9ae949b58':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I35dac10df46e313fbe013fcc09337f8e9ac95890
2016-05-23 23:14:35 +00:00
TreeHugger Robot
d15cc7a83e Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev 2016-05-23 23:04:36 +00:00
Adrian Roos
f5faf9db14 Deprecate unnecessairy Notification.Style constructors
Change-Id: I7a15eaaac4f756d137483aec5f389951c5a7eecb
Fixes: 28775574
2016-05-23 14:00:07 -07:00
Chris Wren
601b4eef88 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev am: 0a9ccf2619 am: 688ebc6f75
am: f9f6d64ed8

* commit 'f9f6d64ed8406dc6417cc88c9e49d68d45c3773a':
  Never fetch notification badges for USER_SYSTEM

Change-Id: I25e158bfe98d4bca60a7e460b6c6bd6784caade0
2016-05-23 17:58:04 +00:00
Chris Wren
f9f6d64ed8 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev am: 0a9ccf2619
am: 688ebc6f75

* commit '688ebc6f753ad574e1e2ca3f67acf592abe53d5c':
  Never fetch notification badges for USER_SYSTEM

Change-Id: I8492b9148b66b9aef69362b10de10ef8f991ecc7
2016-05-23 17:53:25 +00:00
Chris Wren
688ebc6f75 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev
am: 0a9ccf2619

* commit '0a9ccf26192bc5a6fd74afb7afd4834b08230299':
  Never fetch notification badges for USER_SYSTEM

Change-Id: I0e4bd4aaf4c6513c289ca948f63c5bc5c3c7ed02
2016-05-23 17:47:29 +00:00
Chris Wren
0a9ccf2619 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev 2016-05-23 17:44:16 +00:00
Chad Brubaker
532bbd2438 Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387 am: 76d3d8590d
am: be04f7247a

* commit 'be04f7247a5835bcba2f598e9d47e0a07d08af3d':
  Use an attribute for the network security config resource

Change-Id: I5c2213114bf26a4506a64c5a5a8a2e592610783d
2016-05-23 02:44:34 +00:00
Chad Brubaker
be04f7247a Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387
am: 76d3d8590d

* commit '76d3d8590d1fb9a9c341159fbc06914ef19bdb8d':
  Use an attribute for the network security config resource

Change-Id: I15da47a2cd78dc37019bd20847d13248612c77f5
2016-05-23 02:38:19 +00:00
Chad Brubaker
76d3d8590d Merge "Use an attribute for the network security config resource" into nyc-dev
am: 6812bdf387

* commit '6812bdf38797101d3744befe70f3501b75f01ce6':
  Use an attribute for the network security config resource

Change-Id: I2236b69a2af2258e7600a4833fe7be95f64e6260
2016-05-23 02:32:19 +00:00
Chris Wren
66619a2ea1 Never fetch notification badges for USER_SYSTEM
This user never gets a badge, and secondary users will
see a security exception attempting to fetch it for
USER_ALL notifications, such as USB and battery state,
which are posted by USER_SYSTEM.

Bug: 28743335
Change-Id: I65aeb1cf2192811055f8cd94df0b7e292c5c1acf
2016-05-20 14:24:55 -04:00
Chad Brubaker
c845b2a21c Use an attribute for the network security config resource
Originally we went with the meta-data approach to make unbundling
easier, however with the amount of platform changes that the config
ended up relying on it would be better to focus on exposing it through
the platform.

Bug:28763009
Change-Id: Iaf80001b1980220cd2e1e05faf2dc86af41700e1
2016-05-19 17:25:41 -07:00
The Android Automerger
1ec2fd72ce stephenli@ manually merge many commits up to '032dcff'
* commit '032dcff': (22 commits)
  Remove outdated google services links.
  Fix misc-macro-parentheses warnings in services jni.
  Fix misc-macro-parentheses warnings in hwui and graphic jni.
  Fix misc-macro-parentheses warnings in aapt and androidfw.
  docs: Update to column widths for Complications table
  Fix a11y crash when window layer isn't unique.
  Never set resized while not drag resizing for pinned stack.
  While turning OFF do not honor ON requests.
  Fix GATT autoConnect race condition
  Fix GATT autoConnect race condition
  Fix RTL issue in delete dialog.
  Incorporate feedback on new wallpaper-related APIs
  Mapping up/down of legacy Gps vs. Gnss Status
  Fixed a bug where the chronometer was invisible
  Fixed a bug where the chronometer wasn't updating the time
  Update BlockedNumberContract javadocs.
  [RenderScript] Fix ScriptIntrinsicBlur documentation.
  Update documentation about copyTo and copyFrom.
  DO NOT MERGE Cherry pick libpng usage fixes
  Start the Wear Time System Service with SystemServer
  ...
2016-05-19 23:51:32 +00:00
Sergio Giro
cfc00030cc resolve merge conflicts of 882c7d2 to master
Change-Id: I1235236c405e46fc984c7dda743fc6815ba7aab9
2016-05-19 22:11:37 +01:00
Selim Cinek
e934d32862 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev am: 2486cb2c89
am: e9b32c77f8

* commit 'e9b32c77f88a2acb7e7e23fbd14f6b4f373cba0b':
  Fixed a bug where the chronometer was invisible

Change-Id: Ie6f36bca7345f7b1f86425e993deb7d617bbc4d5
2016-05-19 20:54:37 +00:00
Selim Cinek
e9b32c77f8 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev
am: 2486cb2c89

* commit '2486cb2c8978003d2b5cfa7e8169019421582cb0':
  Fixed a bug where the chronometer was invisible

Change-Id: I8caf83fdb4a27e477e644123d349bc4951eda0dd
2016-05-19 20:49:24 +00:00
TreeHugger Robot
2486cb2c89 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev 2016-05-19 20:40:26 +00:00
Chris Tate
2467a7fe90 Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev am: 9d37bdcb91
am: 3de573733c

* commit '3de573733c05d204589d9c56fb26fbb985ecc060':
  Incorporate feedback on new wallpaper-related APIs

Change-Id: I7cbca080286f54040782c79eab57f2285cee222d
2016-05-19 19:44:15 +00:00
Christopher Tate
3de573733c Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev
am: 9d37bdcb91

* commit '9d37bdcb91dffbfeebc45ef5ae7724c556cb6864':
  Incorporate feedback on new wallpaper-related APIs

Change-Id: Iea24b4a97c72248c185f8756b8b74b8b60f3c05f
2016-05-19 19:38:48 +00:00
Chris Tate
9d37bdcb91 Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev 2016-05-19 19:34:08 +00:00
Sergio Giro
882c7d244c Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev am: 44b9f13f9c
am: 3eb0680642

* commit '3eb06806429f444fe87b894308681e20e6871c7d':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: Ia3c21577450bc028548e8427a4a0f9f552e4890f
2016-05-19 18:21:50 +00:00
Sergio Giro
3eb0680642 Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev
am: 44b9f13f9c

* commit '44b9f13f9cfaf2e1136a1f2baab54b229d221fe4':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: Ia20b312dfd8181fadd38f075817630a1c5ab518f
2016-05-19 18:09:30 +00:00
Christopher Tate
98d609ce3f Incorporate feedback on new wallpaper-related APIs
- Documentation
- Method naming
- Throwing exceptions rather than returning zero/null/false on input failures

Bug 28773334

Change-Id: Ia41c1e31c76b7114f3ffeb16033384cac5a1031d
2016-05-19 10:33:22 -07:00
Sergio Giro
69de32071c ZygoteInit: install AndroidKeyStoreProvider in the Zygote
Instead of in activity thread. That way, we can warm up (ie,
precompute cached values) this provider and AndroidBCWorkaroundProvider
(which are installed together) so that the computation doesn't
happen in the app. As a result, the time spent in the first call to
SSLSocketFactory.getDefault() decreases by ~5ms in angler userdebug.
Measured with an app calling SSLSocketFactory.getDefault in onCreate
and timed it with System.currentTimeMillis() .

Bug: 28545496

Change-Id: I73284eccdf6d51dbf55206335d759ccf795c5f41
2016-05-19 16:42:19 +00:00
Andreas Gampe
059db73b1f Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c am: 3fbf298984
am: 36061b85ff

* commit '36061b85ff3776c4df57b1ea42c7059234585be7':
  Frameworks/base: Optimize LoadedApk

Change-Id: I894cf7dc97eaa6ddaec758cb7731803e173209ca
2016-05-19 04:00:15 +00:00
Andreas Gampe
36061b85ff Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c
am: 3fbf298984

* commit '3fbf29898459d3b6d9fa1680c02650fd692c32e6':
  Frameworks/base: Optimize LoadedApk

Change-Id: Id57874836bd9a4e13b57cad2fdc1ff28d6a8f19c
2016-05-19 03:55:17 +00:00
Andreas Gampe
3fbf298984 Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev
am: 8cb3b2bb5c

* commit '8cb3b2bb5c49322cef07931a0ee14c99da5e4b0b':
  Frameworks/base: Optimize LoadedApk

Change-Id: Id11e7e9114403ab70c83601f1988f098d5728a5b
2016-05-19 03:51:39 +00:00
TreeHugger Robot
8cb3b2bb5c Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev 2016-05-19 03:43:08 +00:00
Andreas Gampe
90e4bf8b0f Merge "Frameworks/base: Add more systrace points" into nyc-dev am: b40bcfb6ad am: 54748384ea
am: f466f7bbd5

* commit 'f466f7bbd51a0bf3fe271d924e28018458d3b542':
  Frameworks/base: Add more systrace points

Change-Id: If2657b0ee41ccbac74981f0500c12515858aa70f
2016-05-19 00:23:53 +00:00
Christopher Tate
d3d1a915fa Add default lock wallpaper capability and API am: 5d99d47f39 am: 8d71edc83d
am: 3f42e0a3f3

* commit '3f42e0a3f3c8fb51804e9f3be40e3262ff67f2d5':
  Add default lock wallpaper capability and API

Change-Id: I19ee7b66c2a90aa6764d4e4e5e1f9e041322e9d2
2016-05-19 00:19:55 +00:00
Andreas Gampe
f466f7bbd5 Merge "Frameworks/base: Add more systrace points" into nyc-dev am: b40bcfb6ad
am: 54748384ea

* commit '54748384ea3e001cbc97ecdf67501c8592925df7':
  Frameworks/base: Add more systrace points

Change-Id: I4a3b4143a87c5e928d7149d57a899af0c0aecb0b
2016-05-19 00:19:48 +00:00
Andreas Gampe
54748384ea Merge "Frameworks/base: Add more systrace points" into nyc-dev
am: b40bcfb6ad

* commit 'b40bcfb6ad3d60e5606f41c6628c133512e0538e':
  Frameworks/base: Add more systrace points

Change-Id: I1ede493eaab4a86c67a992c2eb4129f81d903d1c
2016-05-19 00:14:14 +00:00
Selim Cinek
c2c0b043cf Fixed a bug where the chronometer was invisible
We were requiring the time to show in order to show the chronomer
which didn't make any sense.

Change-Id: Ia6d00d0932d272a6c5e20e8b41e3acfb53b7987a
Fixes: 28848113
2016-05-18 17:13:46 -07:00
Christopher Tate
c79333d873 Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev am: b100777562 am: c5bbf34cd9
am: 4b8088ea8d

* commit '4b8088ea8d2efece9c588b0ddee24ad06d53a28b':
  API feedback: rename JobInfo methods for clarity

Change-Id: I2ee283a476e1bc706509016c80821e1f9bc1020b
2016-05-19 00:13:17 +00:00
Christopher Tate
3f42e0a3f3 Add default lock wallpaper capability and API am: 5d99d47f39
am: 8d71edc83d

* commit '8d71edc83de3c695f27967dd3378306654b9953c':
  Add default lock wallpaper capability and API

Change-Id: I676d2ab9526f9e2e47f79a73cbb680673ded50f0
2016-05-19 00:13:04 +00:00
TreeHugger Robot
b40bcfb6ad Merge "Frameworks/base: Add more systrace points" into nyc-dev 2016-05-19 00:09:09 +00:00
Chris Tate
4b8088ea8d Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev am: b100777562
am: c5bbf34cd9

* commit 'c5bbf34cd940f8fa62662bec3a71f7160983dc06':
  API feedback: rename JobInfo methods for clarity

Change-Id: I4b97e2f581ce0c36d1385a510916b4ad3bc4e1af
2016-05-19 00:03:45 +00:00
Christopher Tate
8d71edc83d Add default lock wallpaper capability and API
am: 5d99d47f39

* commit '5d99d47f39d741ebe4a1ede53affc8c6bd198b2f':
  Add default lock wallpaper capability and API

Change-Id: Ib617878c13d4a6530a12365199742fa7ffb5d590
2016-05-19 00:02:47 +00:00
Christopher Tate
c5bbf34cd9 Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev
am: b100777562

* commit 'b1007775622f1814c87eef3ee5a325f606adb26c':
  API feedback: rename JobInfo methods for clarity

Change-Id: I4fb08a73a64233e9d016f520f08944e22ec5ccd3
2016-05-18 23:58:03 +00:00
Christopher Tate
5d99d47f39 Add default lock wallpaper capability and API
If present, the system property "ro.config.lock_wallpaper" provides a
filesystem path to a decodeable image file to use as the system's
out-of-the-box lock wallpaper imagery.  In the absence of this
system property, or if the indicated file is absent or unreadable,
then the new framework resource
com.android.internal.R.drawable.default_lock_wallpaper is consulted to
locate a usable asset.  This mechanism parallels the existing one for
the default system wallpaper.

By default there is no specific lock wallpaper asset; the resource is
defined to be @null in the standard config.xml file.  A product that
wants to define such a factory-default lock-only wallpaper image
will provide the asset as part of its framework resource overlay.

Bug 27828056

Change-Id: Iebf3706222370d0a0a4baf88d71a59ead07a25c7
2016-05-18 23:57:46 +00:00
Chris Tate
b100777562 Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev 2016-05-18 23:50:14 +00:00
Andreas Gampe
a8a58ffdee Frameworks/base: Optimize LoadedApk
Preallocate storage lists and avoid TextUtils and its string
builder for a common code path.

Optimize list join helper to not have a check in the loop.

Bug: 28801010
Change-Id: Iafc582031f973d718252b34bcda6405a77425628
2016-05-18 15:48:12 -07:00
Andreas Gampe
4c8e542f68 Frameworks/base: Add more systrace points
Add more systrace points for application startup.

Bug: 28625993
Change-Id: I76dca9e842fb43f1b85981ef94582074d31528c8
2016-05-18 15:43:45 -07:00
Robert Carr
2fd8c219b2 Merge "Fixes for ending PiP animation." into nyc-dev am: bc9edc7ccb am: 9782de1ffd
am: 3b0a049b11

* commit '3b0a049b1175189c6a6b2f2d0dca05f925ec3b67':
  Fixes for ending PiP animation.

Change-Id: I0cd5217e724182d979c08cc367c24d63dec3a7cc
2016-05-18 22:16:00 +00:00
Robert Carr
3b0a049b11 Merge "Fixes for ending PiP animation." into nyc-dev am: bc9edc7ccb
am: 9782de1ffd

* commit '9782de1ffd344d1a8250b8ead4a13eee16c20cde':
  Fixes for ending PiP animation.

Change-Id: I34acea654389eedd7d3b6f6e7ec2f239cccf2ae6
2016-05-18 22:11:10 +00:00
Robert Carr
9782de1ffd Merge "Fixes for ending PiP animation." into nyc-dev
am: bc9edc7ccb

* commit 'bc9edc7ccb4d876bfc5c706fbb64dab9a2768b52':
  Fixes for ending PiP animation.

Change-Id: If885965536859bc2433d14d4993010871c171360
2016-05-18 22:05:30 +00:00
Robert Carr
cd1a9642e8 Merge "Fixes for ending PiP animation." into nyc-dev
am: bc9edc7ccb

* commit 'bc9edc7ccb4d876bfc5c706fbb64dab9a2768b52':
  Fixes for ending PiP animation.

Change-Id: I58d62d0d0dd964264395b545bf4e3093a0ffaf88
2016-05-18 22:05:28 +00:00
Winson
81100ae084 Merge "Mark occluded home stack as invisible." into nyc-dev am: 32b54f2e42 am: 6e2ee9e382
am: ea9220988e

* commit 'ea9220988e8c88d258a5cb99e2687ee03f90cf55':
  Mark occluded home stack as invisible.

Change-Id: I8f9f1a92e198f7db97d7c3e1b93ff77a83fdbc5c
2016-05-18 22:01:00 +00:00