136719 Commits

Author SHA1 Message Date
Christoph Studer
19a81a616f Merge "NoMan: Don't unbind system listeners" into lmp-preview-dev 2014-05-28 12:10:34 +00:00
Sungsoo Lim
d3ee3ca90c Merge "Fix a typo" into lmp-preview-dev 2014-05-28 09:37:29 +00:00
Lorenzo Colitti
38fe398453 DO NOT MERGE - Support disconnecting while trying to connect.
Currently, once a NetworkAgent has decided to connect, there's
no way to disconnect without first connecting and having
ConnectivityService tear down the connection. This is suboptimal
because it causes the transport to keep retrying even if it knows
that it will not be able to connect.

Instead, allow the transport to abort a connection request that's
in progress, as long as the agent is not yet registered with
ConnectivityService.

Also add locking to evalScores. evalScores should already have
been taking a lock, because it accesses member variables that are
also accessed by the send*methods.

Bug: 15295359
Change-Id: I913c341bdfc50be9c23b632399f53168e754c1c0
(cherry picked from commit 081e99c3ac341734467b65458f94adc160f50d6c)
2014-05-28 09:29:07 +00:00
Yin-Chia Yeh
8490ace76f Camera2: switch API interface to java classses
android.sensor.info.physicalSize: float[] -> SizeF
android.statistics.hotPixelMap: int[] -> Point[]
android.tonemap.curve[Red|Green|Blue]: float[] -> TonemapCurve

Bug: 14628001
Change-Id: I1e085f5e640a059852fcb504b6dd5f884039e653
2014-05-28 01:36:54 -07:00
Eino-Ville Talvala
2bb91a7a68 Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
Also fix a minor bug in ColorSpaceTransform copying validation.

Affected keys:
  android.colorCorrection.transform
  android.colorCorrection.gain
  android.control.aeAvailableAntibandingModes
  android.control.aeAvailableModes
  android.control.afAvailableModes
  android.control.availableEffects
  android.control.availableSceneModes
  android.control.availableVideoStabilizationModes
  android.control.awbAvailableModes
  android.edge.availableEdgeModes
  android.hotpixel.availableHotPixelModes
  android.lens.info.availableOpticalStabilization
  android.noiseReduction.availableNoiseReductionModes
  android.sensor.calibrationTransform1
  android.sensor.calibrationTransform2
  android.sensor.colorTransform1
  android.sensor.colorTransform2
  android.sensor.forwardTransform1
  android.sensor.forwardTransform2
  android.statistics.info.availableFaceDetectModes
  android.tonemap.availableToneMapModes

Bug: 14628001
Change-Id: Ic0a3ff0aaa6bfe872cf8fb740870618c3eee3008
2014-05-28 01:36:53 -07:00
Igor Murashkin
78712a8bd7 camera2: Add new metadata keys, change types for existing range keys
Also adds the following keys:
* android.control.maxRegionsAe
* android.control.maxRegionsAwb
* android.control.maxRegionsAf
* android.request.maxNumOutputRaw
* android.request.maxNumOutputProc
* android.request.maxNumOutputProcStalling

Changes the following keys' type
generations:
* android.control.aeTargetFpsRange
* (Range<Integer>)
* android.control.aeAvailableTargetFpsRanges
* (Range<Integer>[])
* android.control.aeCompensationRange
* (Range<Integer>)
* android.lens.focusRange
* (Range<Float>)

Bug: 14628001
Change-Id: I141847dffc4b0d89cea37c19a54d6d5faf24a9bb
2014-05-28 01:36:53 -07:00
Yin-Chia Yeh
817f8933ee Camera2: Replace int[] by MeteringRectangle
Bug: 14628001
Change-Id: I8ae4efa24d41043046a84b04e5209259a8a21063
2014-05-28 01:36:53 -07:00
Sungsoo Lim
a2c901d430 Fix a typo
Change-Id: I93e7e38a2e3502883b64c38567eaf5957c4197d2
2014-05-28 16:34:21 +09:00
Griff Hazen
197123db24 Merge "DO NOT MERGE Cherry-pick: Doc fixes for Notification.WearableExtender" into lmp-preview-dev 2014-05-28 07:31:26 +00:00
Santos Cordon
3afed57a7d Adding ITelecommService definition for Telecomm.
Until telecomm code moves into a system service, we need a way for
other apps to call into it for call-related functionality.

Initial implementation only has silenceRinger.
This is to be implemented by the telecomm code and used by
TelephonyManager (until we have a TelecommManager).

Change-Id: I9180797451dcb2e9029b20bed47f5d5cb8cddb9f
(cherry picked from commit b895606acf18dbb050c9a32106b3c9c2e5111829)
2014-05-28 03:36:36 +00:00
Fabrice Di Meglio
bbd8e6ffc6 Merge "Revert "Only allow 1 Stack on Leanback-only devices"" into lmp-preview-dev 2014-05-28 01:50:08 +00:00
Fabrice Di Meglio
c82e7d30e3 Revert "Only allow 1 Stack on Leanback-only devices"
This is making a HH device (and probably others) in a reboot loop

This reverts commit 0cac71e9bdee1e9e6b2faafec0f9f894effbcb67.

===

See:

W/dalvikvm( 2320): threadid=1: thread exiting with uncaught exception (group=0x952d3f28)
E/AndroidRuntime( 2320): *** FATAL EXCEPTION IN SYSTEM PROCESS: main
E/AndroidRuntime( 2320): java.lang.RuntimeException: Failed to create service com.android.server.am.ActivityManagerService$Lifecycle: service constructor threw an exception
E/AndroidRuntime( 2320): 	at com.android.server.SystemServiceManager.startService(SystemServiceManager.java:89)
E/AndroidRuntime( 2320): 	at com.android.server.SystemServer.startBootstrapServices(SystemServer.java:304)
E/AndroidRuntime( 2320): 	at com.android.server.SystemServer.run(SystemServer.java:244)
E/AndroidRuntime( 2320): 	at com.android.server.SystemServer.main(SystemServer.java:161)
E/AndroidRuntime( 2320): 	at java.lang.reflect.Method.invokeNative(Native Method)
E/AndroidRuntime( 2320): 	at java.lang.reflect.Method.invoke(Method.java:515)
E/AndroidRuntime( 2320): 	at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:836)
E/AndroidRuntime( 2320): 	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:631)
E/AndroidRuntime( 2320): 	at dalvik.system.NativeStart.main(Native Method)
E/AndroidRuntime( 2320): Caused by: java.lang.reflect.InvocationTargetException
E/AndroidRuntime( 2320): 	at java.lang.reflect.Constructor.constructNative(Native Method)
E/AndroidRuntime( 2320): 	at java.lang.reflect.Constructor.newInstance(Constructor.java:423)
E/AndroidRuntime( 2320): 	at com.android.server.SystemServiceManager.startService(SystemServiceManager.java:78)
E/AndroidRuntime( 2320): 	... 8 more
E/AndroidRuntime( 2320): Caused by: java.lang.NullPointerException
E/AndroidRuntime( 2320): 	at com.android.server.am.ActivityStackSupervisor.isLeanbackOnlyDevice(ActivityStackSupervisor.java:3508)
E/AndroidRuntime( 2320): 	at com.android.server.am.ActivityStackSupervisor.<init>(ActivityStackSupervisor.java:220)
E/AndroidRuntime( 2320): 	at com.android.server.am.ActivityManagerService.<init>(ActivityManagerService.java:2145)
E/AndroidRuntime( 2320): 	at com.android.server.am.ActivityManagerService$Lifecycle.<init>(ActivityManagerService.java:2073)
E/AndroidRuntime( 2320): 	... 11 more
E/AndroidRuntime( 2320): Error reporting crash
E/AndroidRuntime( 2320): java.lang.NullPointerException
E/AndroidRuntime( 2320): 	at com.android.internal.os.RuntimeInit$UncaughtHandler.uncaughtException(RuntimeInit.java:89)
E/AndroidRuntime( 2320): 	at java.lang.ThreadGroup.uncaughtException(ThreadGroup.java:693)
E/AndroidRuntime( 2320): 	at java.lang.ThreadGroup.uncaughtException(ThreadGroup.java:690)
E/AndroidRuntime( 2320): 	at dalvik.system.NativeStart.main(Native Method)
I/Process ( 2320): Sending signal. PID: 2320 SIG: 9
I/ServiceManager(  174): service 'power' died
I/ServiceManager(  174): service 'sensorservice' died

Change-Id: Ib90ae4dff6542d67f5827b100a3ab6158ce88ae2
2014-05-28 01:46:05 +00:00
Deepanshu Gupta
baef8c1ffe Layoutlib fixes for L [DO NOT MERGE]
This adds the new delegates that were missing. This starts the work on
changes related to Minikin Fonts.

There are some changes related to TypedArray that still need to be
fixed.

Change-Id: Ic2397b64aa3f1f48926e849b14689c47d9ee7f8c
(cherry picked from commit 7ca3612094270183243938e79337c84effea7ad0)
2014-05-27 18:01:34 -07:00
Dave Langemak
e2f8183077 Merge "DO NOT MERGE: revert change preventing NULL SSID in a WifiConfiguration" into lmp-preview-dev 2014-05-28 00:48:19 +00:00
vandwalle
f4672ad2e4 DO NOT MERGE: revert change preventing NULL SSID in a WifiConfiguration
bug: 15114340

Change-Id: Ic66363fc7781a1d65e5b8647843a752c048145a1
(cherry picked from commit 7aa05179b970e9f1346374f1e506a2cfeaff060a)
2014-05-28 00:48:04 +00:00
Griff Hazen
d5f11f98d1 DO NOT MERGE Cherry-pick: Add full screen size preset to WearableExtender
Bug: 14838838

Change-Id: Id038d994d61d3c89dba08232a424a5b1b934e5db
2014-05-27 17:36:44 -07:00
Griff Hazen
14f5799ba9 DO NOT MERGE Cherry-pick: Doc fixes for Notification.WearableExtender
Change-Id: I22947e30d329e667079555ac4ac5f9b25d6bd3fa
2014-05-27 17:34:27 -07:00
Griff Hazen
24f1e5342e Merge "DO NOT MERGE Cherry-pick: Fix current.txt" into lmp-preview-dev 2014-05-28 00:32:01 +00:00
Griff Hazen
9ed2e4e465 Merge "DO NOT MERGE Cherry-pick: Fix build: CheckBuild line for removed wearable package" into lmp-preview-dev 2014-05-28 00:31:53 +00:00
Griff Hazen
e6fff6e088 Merge "DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications" into lmp-preview-dev 2014-05-28 00:31:46 +00:00
Jose Lima
80962666b8 Merge "Only allow 1 Stack on Leanback-only devices" into lmp-preview-dev 2014-05-28 00:10:15 +00:00
Chris Craik
ddce68996b Merge "Update docs around empty/null outline behavior" into lmp-preview-dev 2014-05-28 00:08:58 +00:00
Igor Murashkin
79458826c6 Merge "camera2: Add partial results to the capture listener (API change)" into lmp-preview-dev 2014-05-27 23:54:21 +00:00
Jose Lima
a5c7e0f80f Only allow 1 Stack on Leanback-only devices
- For Leanback only devices we will force all activities to
   live in the same app stack. This is a design decision for the
   shy/gregarious changes we are planning to implement for
   leanback devices.

Change-Id: I201f56541ba22356e9598f09419ad41e588c74dc
2014-05-27 16:51:35 -07:00
Adrian Roos
26690339e9 Merge "Add and improve logged TrustAgent connection events" into lmp-preview-dev 2014-05-27 23:46:50 +00:00
Dave Langemak
dab839e047 Merge "Move dis/enable of mobile data to Telephony" into lmp-preview-dev 2014-05-27 21:26:52 +00:00
Chris Craik
67c360f3d5 Update docs around empty/null outline behavior
bug:15257846
Change-Id: Ie4d1b0aaeb900eaaa7e54097f3e0d795beb8f445
2014-05-27 14:10:17 -07:00
Jorim Jaggi
2d6f780cc5 Merge "Remove charging text and carrier label on bouncer." into lmp-preview-dev 2014-05-27 20:30:28 +00:00
Robert Greenwalt
afa05c0b43 Move dis/enable of mobile data to Telephony
ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
(cherry picked from commit 53013c87496980b534e447e717a32698fbd4bca0)
2014-05-27 20:28:50 +00:00
Ashish Sharma
6020071df9 Include START event (reboots) in partial history.
Change-Id: Ia1e5fba6c2c7bdb3f09eb5958d7134564d60e8b0
2014-05-27 20:27:59 +00:00
Jorim Jaggi
6ecbe3f2d6 Merge "Remove up pointing arrow in navbar." into lmp-preview-dev 2014-05-27 20:24:48 +00:00
Jorim Jaggi
7b0de297e1 Remove up pointing arrow in navbar.
We don't need it anymore. Yay!

Bug: 15283575
Change-Id: Iac5543a733c047711e5c37f290758456116469a5
2014-05-27 22:22:51 +02:00
Jorim Jaggi
40a0b38160 Remove charging text and carrier label on bouncer.
But still show it for SIM PIN/PUK.

Bug: 15283575
Change-Id: Id343e5b2fb5c695f46cd23d8509109987fa2d290
2014-05-27 22:20:37 +02:00
Jean-Michel Trivi
1ad0192800 DO NOT MERGE temporary hide of AudioAttributes
Bug 15089989

Change-Id: I6077d4906d5624be4dd2b8a5c3378a04c848b6d8
2014-05-27 12:44:05 -07:00
John Spurlock
3d09bbd04f Better wifi-enabled signal from network controller.
The old "is wifi enabled" signal was geared toward the cluster
view.  Since the clients of the callbacks are now only QS tiles,
make sure to plumb through the actual enabled value all the way
up to the tile.

Bug:15161053
Change-Id: I8b69c599f06d5b36e3f44dc666e1621840ffd927
(cherry picked from commit fd0ea545d47b19c2ebff203a6e768a60698f3609)
2014-05-27 19:34:10 +00:00
Winson Chung
8804ce96b1 Merge "Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)" into lmp-preview-dev 2014-05-27 19:28:51 +00:00
Chris Wren
2ed67e6de7 Merge "Reduce logspam by catching unexpected types ourselves." into lmp-preview-dev 2014-05-27 19:15:25 +00:00
Jorim Jaggi
fbd168331c Merge "Skeleton for Keyguard security method appear animations." into lmp-preview-dev 2014-05-27 18:31:57 +00:00
Jorim Jaggi
37d5c23998 Merge "Show bouncer immediately when MOTION_UP is received" into lmp-preview-dev 2014-05-27 18:31:10 +00:00
Igor Murashkin
db075afc85 camera2: Add partial results to the capture listener (API change)
* Also adds capture sequence aborted callback

Bug: 12492876
Change-Id: I56ec8edbcda8b64c2262ff7472961ac78042c7f4
2014-05-27 11:25:24 -07:00
Winson Chung
9693d95343 Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)
Change-Id: I371ee43296a983782eaed2e661b1febc71c86433
2014-05-27 11:09:22 -07:00
Winson Chung
5859fc1096 Merge "DO NOT MERGE" into lmp-preview-dev 2014-05-27 18:04:36 +00:00
Adrian Roos
7d59b4f981 Add and improve logged TrustAgent connection events
Adds events for when a TrustAgentService gets connected
or is stopped. Also explicitly revokes trust when a
trust agent gets disconnected, such that it shows up in
dumpsys.

Bug: 15281644
Change-Id: I5875a34da923345683279c1f755d43454ff6318d
2014-05-27 20:01:45 +02:00
John Spurlock
150c07993f Merge "frameworks/base: Performance tweaks for SeekBarVolumizer." into lmp-preview-dev 2014-05-27 17:58:48 +00:00
John Spurlock
4bb35da6ce Merge "Remove airplane, bugreport, and ringer mode global actions." into lmp-preview-dev 2014-05-27 17:48:14 +00:00
Christoph Studer
d68200c66b Merge "NoMan: Disable SQLite log DO NOT MERGE" into lmp-preview-dev 2014-05-27 17:41:34 +00:00
Christoph Studer
e397521449 Merge "NoMan: Allow disabling SQLiteLog." into lmp-preview-dev 2014-05-27 17:41:03 +00:00
John Spurlock
17f3f16c4f Remove airplane, bugreport, and ringer mode global actions.
Bug:15281315
Change-Id: I16aa759a3269bb7757350edf2330cd72fd99a023
2014-05-27 13:32:04 -04:00
John Spurlock
95caba1270 frameworks/base: Performance tweaks for SeekBarVolumizer.
Move ringtone init to the worker thread.  Allow the volumizer
instance to be reused by making the seekbar settable.

Bug:15091992
Change-Id: Ib616ae0fbb9a45c63391f8335e48ec2754dbdcd5
2014-05-27 13:10:38 -04:00
Winson Chung
2eb4f9c377 DO NOT MERGE
Removing unnecessary public values. (Bug 14995844)
(cherry picked from commit aa327fc2ce428f939885e1172578ff1dc975214c)

Change-Id: I98672d0ed3120c15bf31ce7a21ab604cfe66273d
2014-05-27 17:07:52 +00:00