136074 Commits

Author SHA1 Message Date
Jason Monk
711b7a5428 Merge "Don't exit lock task on sleep" 2014-05-21 20:58:48 +00:00
Jim Miller
f66bdfc240 am 6f354679: (-s ours) am af103dd3: am 911176d7: am 607d5998: Fix crash in widget pager - DO NOT MERGE
* commit '6f3546796a381a17e4e8e6dbf869ca75abfab696':
  Fix crash in widget pager - DO NOT MERGE
2014-05-21 20:49:16 +00:00
narayan
a562f5daf6 am 82ec8c58: am ab3d85ab: am 838b1e22: Merge "Fix NPE in PackageManagerService."
* commit '82ec8c58b1f1cd0cce56d11b7679440f6ba54f4a':
  Fix NPE in PackageManagerService.
2014-05-21 20:49:09 +00:00
Jim Miller
6f3546796a am af103dd3: am 911176d7: am 607d5998: Fix crash in widget pager - DO NOT MERGE
* commit 'af103dd39346d1bae3566cafbfcd1008bc6cef5c':
  Fix crash in widget pager - DO NOT MERGE
2014-05-21 20:43:18 +00:00
Jim Miller
af103dd393 am 911176d7: am 607d5998: Fix crash in widget pager - DO NOT MERGE
* commit '911176d7e6c8ba28ed7f7be63edcb17456f615fe':
  Fix crash in widget pager - DO NOT MERGE
2014-05-21 20:39:41 +00:00
Svetoslav
cc84b415b4 Merge "Addressing APIs council feedback" 2014-05-21 20:38:14 +00:00
Jim Miller
911176d7e6 am 607d5998: Fix crash in widget pager - DO NOT MERGE
* commit '607d59982a046d23770a7289be6272ad5983d6ae':
  Fix crash in widget pager - DO NOT MERGE
2014-05-21 20:35:51 +00:00
Svetoslav
95b6fd8b7a Addressing APIs council feedback
bug:15089461

Change-Id: Ifcb003b114e2e50333bb0ef386d99482f7bfaa6e
2014-05-21 13:35:42 -07:00
Winson Chung
451e964f2c Merge "Enabling clipping on task views." 2014-05-21 20:24:05 +00:00
narayan
82ec8c58b1 am ab3d85ab: am 838b1e22: Merge "Fix NPE in PackageManagerService."
* commit 'ab3d85ab1a0ae58add5df6efc30607624475405b':
  Fix NPE in PackageManagerService.
2014-05-21 20:22:03 +00:00
narayan
ab3d85ab1a am 838b1e22: Merge "Fix NPE in PackageManagerService."
* commit '838b1e2215cbc27e77530f4c79124c088353e0e7':
  Fix NPE in PackageManagerService.
2014-05-21 20:17:52 +00:00
Christoph Studer
ae241f9978 Merge "Simplify NotificationListenerService API" 2014-05-21 20:16:15 +00:00
narayan
838b1e2215 Merge "Fix NPE in PackageManagerService." 2014-05-21 20:14:56 +00:00
Svetoslav Ganov
1fe52cde2b Merge "Switching to the final PDF rendering library" 2014-05-21 20:11:34 +00:00
Jason Monk
2d437d0461 Don't exit lock task on sleep
Change-Id: I332088ce31ce06a771461a78fcc63f4afc824813
2014-05-21 16:06:53 -04:00
Christoph Studer
cee44ba418 Simplify NotificationListenerService API
Use ParceledListSlice to send the list of active notifications
from NoMan to NotificationListeners.

This allows us to simplify the API to what it was before
introducing the "String[] key" workaround for dealing with large
numbers of StatusBarNotifications.

While we're at it, rename Ranking.getIndexOfKey to something that
makes more sense.

Bug: 15126927
Change-Id: I02c2087978c6c4ec1198be496c6250a66143ecb3
2014-05-21 22:03:45 +02:00
narayan
0cfe875ac5 Fix NPE in PackageManagerService.
Check that each package from the setting has
a parsed pkg before we attempt to perform dex-opt
on it. If it doesn't have a parsed package, adjust
the ABI in the settings, but don't perform dexopt.
It will be dexopted later if it's still active
based on the setting.

bug: 15081286

Change-Id: Ifb6d1d5efdc9c59b251731972afa951ad930d05c
2014-05-21 21:00:48 +01:00
RoboErik
5b53148a4e Merge changes I1cbdff1d,I23906b4c
* changes:
  Handle headsethook voice launching
  Add 5s timeout to wakelock
2014-05-21 19:59:11 +00:00
justinzhang
afe18ed6cd Merge "Use DeviecPolicyManager to authenticate lock task" 2014-05-21 19:58:34 +00:00
Svetoslav Ganov
519c77b710 Switching to the final PDF rendering library
Change-Id: Id92674ce762af894a5c4b0df0f8e9a711131bccc
2014-05-21 12:43:51 -07:00
justinzhang
7bd35c7e6f Use DeviecPolicyManager to authenticate lock task
Uncomment lines in ActivityManagerService. Before start lock task,
ActivityMangerService calls DevicePolicyManager to see if the
app can go into lock task.

Change-Id: I9ad784d7cc637d45884dcb2623b4c59ff802f93d
2014-05-21 15:28:08 -04:00
Ed Heyl
1c7c2a0dfa Merge "Fix the build: Revert "Switching to the final PDF rendering library"" 2014-05-21 19:23:29 +00:00
Ed Heyl
a5291466ea Fix the build: Revert "Switching to the final PDF rendering library"
This reverts commit e7a8f476ea3873941ace96751fa2d633c95b7c10.

Change-Id: I457e45b0a536bbde721a3355ed860b2363e36467
2014-05-21 19:21:06 +00:00
Ihab Awad
b1b7addf2a Merge "Add logging utilities to Telecomm classes" 2014-05-21 19:07:24 +00:00
Ihab Awad
60ac30bb8a Add logging utilities to Telecomm classes
Add logging utility class from packages/services/Telecomm to the Telecomm
classes in the framework.

Change-Id: I54a9edc4daa24ffdeb15b08afc5ad8a238d04291
2014-05-21 12:06:00 -07:00
Glenn Kasten
ed727159d6 Merge "Update android.media.AudioTrack.getTimestamp API documentation" 2014-05-21 18:38:42 +00:00
Jeff Tinker
7e1329f574 Build cast v2 mediadrm signer library as non-static
bug: 13988104
Change-Id: Ie94074dd46e4489c7d4e0f378d1e35b14bb0c0ac
2014-05-21 18:18:03 +00:00
Vinod Krishnan
23c42748dc am 82fa124c: am 4f65a545: Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev
* commit '82fa124c3a2753ce70c04973d8004b2b1950993d':
  Adding more DeviceDefault for CTS tests
2014-05-21 18:10:37 +00:00
Winson Chung
5a9b0b0c7d Enabling clipping on task views.
Change-Id: I2a4b8fe06ae379364081534bd5b02f52b27e4ff2
2014-05-21 11:07:26 -07:00
George Mount
0a69ce6cf6 Merge "Fixed inverse of listener assignment." 2014-05-21 17:54:45 +00:00
Vinod Krishnan
82fa124c3a am 4f65a545: Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev
* commit '4f65a5456159b64185bb99c193bcff93b07770f8':
  Adding more DeviceDefault for CTS tests
2014-05-21 17:46:16 +00:00
Svetoslav
8313e17dc1 Merge "Switching to the final PDF rendering library" 2014-05-21 17:43:14 +00:00
Svetoslav
89ff50cea8 Switching to the final PDF rendering library
Change-Id: I5bad4fc620378f3ca6b070bbaeee631f526b66c7
2014-05-21 10:40:42 -07:00
Vinod Krishnan
4f65a54561 Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev 2014-05-21 17:40:06 +00:00
Vinod Krishnan
9b8e4d01f6 Adding more DeviceDefault for CTS tests
Bug: 15091518
Change-Id: Iddabacbd023f031c9c4ec6fd4c4f60ce17b606c4
2014-05-21 10:28:57 -07:00
Dan Sandler
2114b7003f am d0ec8438: am 7509733c: Elide extras strings from noman dumpsys output.
* commit 'd0ec8438820d936e13664ec052c01f14d8a4e8e3':
  Elide extras strings from noman dumpsys output.
2014-05-21 17:28:43 +00:00
Alan Viverette
8f2d99b9ee Merge "Quantum popup nine-patch with baked-in shadow" 2014-05-21 17:23:55 +00:00
Jeff Sharkey
b01cb2c0c2 am fce708d2: am 9ef2117f: am bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"
* commit 'fce708d285506f65eb51a3256b2a04111e4054cc':
  Check for null in LocalSocketImpl.SocketInputStream.available()
2014-05-21 17:15:19 +00:00
Glenn Kasten
486918b415 Update android.media.AudioTrack.getTimestamp API documentation
Change-Id: I0928c73c147ce843ae46565883da209b278fb3b4
2014-05-21 09:36:41 -07:00
Craig Mautner
4ee3580609 Merge "Change method name per API council request" 2014-05-21 16:35:27 +00:00
Dan Sandler
d0ec843882 am 7509733c: Elide extras strings from noman dumpsys output.
* commit '7509733c8dfb4e65dbb45ab582e09d599dfaaa28':
  Elide extras strings from noman dumpsys output.
2014-05-21 16:26:29 +00:00
Jeff Sharkey
fce708d285 am 9ef2117f: am bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"
* commit '9ef2117f0e65db60cb3f9708174bcaca4db813b2':
  Check for null in LocalSocketImpl.SocketInputStream.available()
2014-05-21 16:13:18 +00:00
Jeff Sharkey
9ef2117f0e am bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"
* commit 'bc06158a78297747605981702c8e41956ea1aa2d':
  Check for null in LocalSocketImpl.SocketInputStream.available()
2014-05-21 16:05:34 +00:00
Jeff Sharkey
bc06158a78 Merge "Check for null in LocalSocketImpl.SocketInputStream.available()" 2014-05-21 16:03:08 +00:00
Dan Sandler
7509733c8d Elide extras strings from noman dumpsys output.
Bug: 14292528
Change-Id: I19cfb6b692e6901fa7f115ea675b1b03fc5ba176
(cherry picked from commit 44de3cfc08428378b93172a2b03f9785a3638678)
2014-05-21 15:57:10 +00:00
Baligh Uddin
bee9d71293 am 9472cadd: (-s ours) am ef2b35cc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '9472cadd2219fbe956ea6ba32853efc12abbf69f':
  Import translations. DO NOT MERGE
2014-05-21 15:43:30 +00:00
Baligh Uddin
fb1810e34f Merge "Import translations. DO NOT MERGE" 2014-05-21 15:42:58 +00:00
George Mount
d80154fba1 Fixed inverse of listener assignment.
Change-Id: Icaa68d54c3f4ca74009edd19ef5ab197b73eb66a
2014-05-21 08:40:03 -07:00
Baligh Uddin
9472cadd22 am ef2b35cc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'ef2b35cc2e87058ead622bd1858d358690c201fd':
  Import translations. DO NOT MERGE
2014-05-21 15:38:26 +00:00
Baligh Uddin
e24d8c8fc3 Merge "Import translations. DO NOT MERGE" 2014-05-21 15:34:50 +00:00