Commit Graph

136966 Commits

Author SHA1 Message Date
e0a88629e1 am 5e73be4a: Merge "Fix a typo" into lmp-preview-dev
* commit '5e73be4affbf84a4935ac310b8323bfc944caa7e':
  Fix a typo
2014-05-28 10:09:40 +00:00
0cfc751a96 am f411d6b7: (-s ours) Merge "DO NOT MERGE Cherry-pick: Doc fixes for Notification.WearableExtender" into lmp-preview-dev
* commit 'f411d6b76348cce21a5e6c05cf6ac7126c620f3b':
  DO NOT MERGE Cherry-pick: Doc fixes for Notification.WearableExtender
2014-05-28 10:09:34 +00:00
d3ee3ca90c Merge "Fix a typo" into lmp-preview-dev 2014-05-28 09:37:29 +00:00
b0674f0f7c Fix a couple of bugs in CEC services
- Correct conversion for byte to int for cec opcode
- Use the right Handler.obtainMessage() to pass an integer variable

Change-Id: Ie3e86225f1702decce454aeb197911a371f51c17
2014-05-28 09:30:39 +00:00
af878b4e3c Merge "Support disconnecting while trying to connect." 2014-05-28 07:40:50 +00:00
9a6a11ae1e 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
2014-05-28 07:35:24 +00:00
a2c901d430 Fix a typo
Change-Id: I93e7e38a2e3502883b64c38567eaf5957c4197d2
2014-05-28 16:34:21 +09:00
197123db24 Merge "DO NOT MERGE Cherry-pick: Doc fixes for Notification.WearableExtender" into lmp-preview-dev 2014-05-28 07:31:26 +00:00
bc132a068b Merge "Implementation of TaskManager reschedule/cancel" 2014-05-28 02:52:00 +00:00
4a4a17aa11 am f52b9c8a: Merge "Revert "Only allow 1 Stack on Leanback-only devices"" into lmp-preview-dev
* commit 'f52b9c8a4aebf6d04b747e45c921fa4f51344b34':
  Revert "Only allow 1 Stack on Leanback-only devices"
2014-05-28 01:53:43 +00:00
bbd8e6ffc6 Merge "Revert "Only allow 1 Stack on Leanback-only devices"" into lmp-preview-dev 2014-05-28 01:50:08 +00:00
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
b61c506a50 Implementation of TaskManager reschedule/cancel
Issues here:
"Reschedule" of an idle-mode task is not well-defined. In the
API I throw an error if you try to set a back-off policy on
an idle mode task.
Implementation-wise, i add a delay for a reschedule request of an
idle mode task. This means that if the phone's still in idle mode
after the delay they app will get a call back, but otherwise it'll
have to wait til the next one.

Implemented all API functions

Change-Id: I0264c2614cc52c28730abbcb1557f314f058f991
2014-05-27 18:36:54 -07:00
98d65c8aa3 am 56588ed0: (-s ours) Merge "DO NOT MERGE: revert change preventing NULL SSID in a WifiConfiguration" into lmp-preview-dev
* commit '56588ed08e007c7bf0c53fd211b1ebde7a24577c':
  DO NOT MERGE: revert change preventing NULL SSID in a WifiConfiguration
2014-05-28 00:53:39 +00:00
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
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
75c191a6e6 am 31418fd9: (-s ours) Merge "DO NOT MERGE Cherry-pick: Fix current.txt" into lmp-preview-dev
* commit '31418fd9965b0d79814f816eb898bae202a76e50':
  DO NOT MERGE Cherry-pick: Fix current.txt
2014-05-28 00:34:32 +00:00
14f5799ba9 DO NOT MERGE Cherry-pick: Doc fixes for Notification.WearableExtender
Change-Id: I22947e30d329e667079555ac4ac5f9b25d6bd3fa
2014-05-27 17:34:27 -07:00
62ba122e72 am 47d9f4c9: (-s ours) Merge "DO NOT MERGE Cherry-pick: Fix build: CheckBuild line for removed wearable package" into lmp-preview-dev
* commit '47d9f4c95339171ce85547a5c0d3dd8a5a758836':
  DO NOT MERGE Cherry-pick: Fix build: CheckBuild line for removed wearable package
2014-05-28 00:34:27 +00:00
092125dbbb am 4f19a458: (-s ours) Merge "DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications" into lmp-preview-dev
* commit '4f19a458ab5de74ad17257594db09b02f0d5f9e0':
  DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications
2014-05-28 00:34:15 +00:00
24f1e5342e Merge "DO NOT MERGE Cherry-pick: Fix current.txt" into lmp-preview-dev 2014-05-28 00:32:01 +00:00
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
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
ca7ddbfef7 am 00430954: Merge "Only allow 1 Stack on Leanback-only devices" into lmp-preview-dev
* commit '004309546b7efa188df56e58539e4227ed192cf7':
  Only allow 1 Stack on Leanback-only devices
2014-05-28 00:13:36 +00:00
f87ec6a644 am 365dfe93: Merge "Update docs around empty/null outline behavior" into lmp-preview-dev
* commit '365dfe93dd3baab1417e20bc9ba7e3175600faa0':
  Update docs around empty/null outline behavior
2014-05-28 00:13:31 +00:00
80962666b8 Merge "Only allow 1 Stack on Leanback-only devices" into lmp-preview-dev 2014-05-28 00:10:15 +00:00
ddce68996b Merge "Update docs around empty/null outline behavior" into lmp-preview-dev 2014-05-28 00:08:58 +00:00
5fe5bcaeaa am dc0230fc: Merge "camera2: Add partial results to the capture listener (API change)" into lmp-preview-dev
* commit 'dc0230fc450e8880fb640cd476f2248bf0a401e4':
  camera2: Add partial results to the capture listener (API change)
2014-05-27 23:57:36 +00:00
79458826c6 Merge "camera2: Add partial results to the capture listener (API change)" into lmp-preview-dev 2014-05-27 23:54:21 +00:00
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
b9fc22029f am 9fb0925e: Merge "Add and improve logged TrustAgent connection events" into lmp-preview-dev
* commit '9fb0925e0ea64ac6124cc0c843db05155cc4ea64':
  Add and improve logged TrustAgent connection events
2014-05-27 23:50:36 +00:00
26690339e9 Merge "Add and improve logged TrustAgent connection events" into lmp-preview-dev 2014-05-27 23:46:50 +00:00
263e006250 Merge "Fix Tethering NPE" 2014-05-27 23:25:10 +00:00
69170a56c6 am be5898b1: am 6f72ac5d: Doc fixes for Notification.WearableExtender
* commit 'be5898b198a9eee2d21eeff345ed19573d37257a':
  Doc fixes for Notification.WearableExtender
2014-05-27 22:47:27 +00:00
be5898b198 am 6f72ac5d: Doc fixes for Notification.WearableExtender
* commit '6f72ac5d5f4b7bae34bb3dab7821f3dbcbf02bcd':
  Doc fixes for Notification.WearableExtender
2014-05-27 22:44:28 +00:00
70c117a873 Fix Tethering NPE
Bug: 10733373
Change-Id: I1d81eb8a60be2b672b925be7577f1288fe870237
2014-05-27 15:31:41 -07:00
fedbe2723a am 4a6a8e5e: Merge "Move dis/enable of mobile data to Telephony" into lmp-preview-dev
* commit '4a6a8e5e3cce491064d6836b59c23fd076de56f2':
  Move dis/enable of mobile data to Telephony
2014-05-27 22:24:21 +00:00
aae5886ad8 Merge "Split frameworks/base using inclusion and exclusion rules." 2014-05-27 21:47:06 +00:00
dab839e047 Merge "Move dis/enable of mobile data to Telephony" into lmp-preview-dev 2014-05-27 21:26:52 +00:00
b00cb8b8c7 Merge "Layoutlib fixes for L" 2014-05-27 21:18:04 +00:00
67c360f3d5 Update docs around empty/null outline behavior
bug:15257846
Change-Id: Ie4d1b0aaeb900eaaa7e54097f3e0d795beb8f445
2014-05-27 14:10:17 -07:00
335daa8c6c Merge "Recurse into directories to find fonts." 2014-05-27 20:59:17 +00:00
b6f583aa70 Recurse into directories to find fonts.
We now recurse into directories to find all fonts. This change is needed
to prevent having to list all fonts in external/google-fonts
individually.

As a side effect, we now only copy xml files over.

Change-Id: Ifdea3b8451878c2449ac7c5e17ef3d1b00d1b955
2014-05-27 13:57:15 -07:00
8f8c085164 Merge "Remove call to deprecated SkBitmap::asImageInfo." 2014-05-27 20:42:44 +00:00
233a0ae88d Merge "Parallel processing of the fonts." 2014-05-27 20:34:57 +00:00
51c9108cab am 4caed7a3: Merge "Remove charging text and carrier label on bouncer." into lmp-preview-dev
* commit '4caed7a3d8c0f6b378205cc85e7e1340d56a48c0':
  Remove charging text and carrier label on bouncer.
2014-05-27 20:32:40 +00:00
87e522efcc am 7279017f: Include START event (reboots) in partial history.
* commit '7279017f52ca1db58eb95bf881f3a2e238a7c2bd':
  Include START event (reboots) in partial history.
2014-05-27 20:32:34 +00:00
2d6f780cc5 Merge "Remove charging text and carrier label on bouncer." into lmp-preview-dev 2014-05-27 20:30:28 +00:00
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
6020071df9 Include START event (reboots) in partial history.
Change-Id: Ia1e5fba6c2c7bdb3f09eb5958d7134564d60e8b0
2014-05-27 20:27:59 +00:00