vandwalle
8ca1f18abf
Merge "various fixes:" into lmp-dev
2014-09-12 23:34:29 +00:00
Matthew Williams
641fc725b2
am 7e84b1a4: Merge "Fix NPE in JobServiceContext" into lmp-dev
...
* commit '7e84b1a4a4e72f1b4953c169cec4599e567c9203':
Fix NPE in JobServiceContext
2014-09-12 23:30:55 +00:00
Jae Seo
26e8e308f5
am 5e74ef0e: Merge "TIF: Add a system API to retrieve HDMI device information" into lmp-dev
...
* commit '5e74ef0eb4a333d4f6a0ab09f2ed6b659018e5c6':
TIF: Add a system API to retrieve HDMI device information
2014-09-12 23:30:50 +00:00
George Mount
331b3ba3e3
am 87483e5e: Merge "Made Transitions act only the views that they target." into lmp-dev
...
* commit '87483e5ea1e08467172d82f8707f8f2470107507':
Made Transitions act only the views that they target.
2014-09-12 23:30:45 +00:00
Alan Viverette
d5d668a0a4
am f559f89c: Merge "Report button opacity for current state, fix button shadows" into lmp-dev
...
* commit 'f559f89c3b4f28f83b163e957b0d2296578431a9':
Report button opacity for current state, fix button shadows
2014-09-12 23:30:40 +00:00
Joe Fernandez
1b12b1dc6f
Merge "docs: remove bad link in the quick view box for TV Recommendations #2 " into klp-modular-docs
2014-09-12 23:28:54 +00:00
Matthew Williams
c0595a7d7d
Merge "Fix NPE in JobServiceContext" into lmp-dev
2014-09-12 23:26:40 +00:00
Matthew Williams
7ac52d5bf6
Fix NPE in JobServiceContext
...
BUG: 17485390
The VERB_BINDING timeout that is set to wait for onBind() to complete
wasn't being cleared when onBind() returns false, i.e. that the service wasn't
available to be bound to.
This led to an NPE when the stale timeout expired. Fix is to clear the timeout
when onBind fails.
Change-Id: I318ca5ce1f3e12b170f7f256608ea7e28f3f120a
2014-09-12 23:26:28 +00:00
Jae Seo
0c1a2ef83b
Merge "TIF: Add a system API to retrieve HDMI device information" into lmp-dev
2014-09-12 23:24:07 +00:00
Joe Fernandez
b813f16c47
docs: remove bad link in the quick view box for TV Recommendations #2
...
Change-Id: I649d8d735bda2b0c657217bc86c1a29a2d7eddc2
2014-09-12 16:24:01 -07:00
Matthew Williams
a9f993cb40
Remove a minimum wake-up time for a job
...
BUG: 16407786
The alarm manager doesn't impose restrictions about how soon an alarm
is allowed to be set in the future, so neither will the JS.
This behaviour should be the default, but filing under above bug
b/c this needs to happen to make CTS easier to write.
Change-Id: I55b53de5faac84f01e2ac3ce5458bfa19d73df68
2014-09-12 16:22:12 -07:00
George Mount
4d527888ac
Merge "Made Transitions act only the views that they target." into lmp-dev
2014-09-12 23:19:15 +00:00
Jae Seo
3c8e65a307
TIF: Add a system API to retrieve HDMI device information
...
Bug: 17487782
Change-Id: I53995735fa190c40819ff352a8b98765a6f7753f
2014-09-12 16:17:51 -07:00
George Mount
5030c7f6f1
Made Transitions act only the views that they target.
...
Bug 17465989
Bug 17452585
Change-Id: I2f921e98f68df3d549a370179c0a4488d56923ad
2014-09-12 16:15:44 -07:00
Craig Mautner
c6fcab0be4
am 1260584f: Merge "Rework the task affiliate chain validation" into lmp-dev
...
* commit '1260584f00c550b6aa8c0a4d483ced34fd3b6bbf':
Rework the task affiliate chain validation
2014-09-12 23:14:57 +00:00
Robert Greenwalt
3d12df3121
am 5710ec48: Merge "Make status bar indicators reflect the network actually in use." into lmp-dev
...
* commit '5710ec483d879d833f19c25eef4d944161ec5a6e':
Make status bar indicators reflect the network actually in use.
2014-09-12 23:14:53 +00:00
Robert Greenwalt
25c4aaafc4
am 3234c20e: Merge "Update Inet state when NetworkMonitor re-evaluates a network." into lmp-dev
...
* commit '3234c20e5eaea49559b31db88ef186fe5440d5a2':
Update Inet state when NetworkMonitor re-evaluates a network.
2014-09-12 23:14:48 +00:00
Alan Viverette
6d32576312
Merge "Report button opacity for current state, fix button shadows" into lmp-dev
2014-09-12 23:14:33 +00:00
Christopher Tate
ee1f25a6dc
am 89b91209: Merge "Track enable/disable of transport components" into lmp-dev
...
* commit '89b912093244837e9f400705099ac4ed22e6c764':
Track enable/disable of transport components
2014-09-12 23:13:52 +00:00
ztenghui
fd51ca6020
am 84a7c1cc: Merge "Update the shadow strength" into lmp-dev
...
* commit '84a7c1cc849f915710e95d93c4afa5e6980395c9':
Update the shadow strength
2014-09-12 23:13:47 +00:00
Jeff Sharkey
df1bbf4d38
am 1ad40a96: Merge "Fix boot loop when deriving device name." into lmp-dev
...
* commit '1ad40a966096c277123cf3d15a4ccdb2cd8af566':
Fix boot loop when deriving device name.
2014-09-12 23:13:42 +00:00
Robert Greenwalt
620a5ffdd7
am da8158b1: Merge "Better handling of unvalidated networks." into lmp-dev
...
* commit 'da8158b1f4b87dac9838f1bb7c515ba6b2b7dd3b':
Better handling of unvalidated networks.
2014-09-12 23:13:38 +00:00
Alan Viverette
888b4cf73c
Report button opacity for current state, fix button shadows
...
BUG: 17433604
Change-Id: I25e0bd9b96e09ed2a4d85476b60f459e7cc33002
2014-09-12 16:13:32 -07:00
Jeff Sharkey
e0d0863c79
am 4a06f52a: Merge "Add xxxhdpi assets for DocumentsUI." into lmp-dev
...
* commit '4a06f52aa174d411d22c9999742a93bf2d2b7099':
Add xxxhdpi assets for DocumentsUI.
2014-09-12 23:13:32 +00:00
Craig Mautner
6225dd239f
Merge "Rework the task affiliate chain validation" into lmp-dev
2014-09-12 23:08:34 +00:00
Robert Greenwalt
d118449477
Merge "Make status bar indicators reflect the network actually in use." into lmp-dev
2014-09-12 23:04:50 +00:00
Robert Greenwalt
b242cf53e8
Merge "Update Inet state when NetworkMonitor re-evaluates a network." into lmp-dev
2014-09-12 23:03:36 +00:00
Christopher Tate
f610bff9ef
Merge "Track enable/disable of transport components" into lmp-dev
2014-09-12 23:03:31 +00:00
ztenghui
692737be4f
Merge "Update the shadow strength" into lmp-dev
2014-09-12 23:02:32 +00:00
Paul Jensen
ad50a1fed0
Update Inet state when NetworkMonitor re-evaluates a network.
...
Previously the Inet state (the little exclamation mark beside the WiFi
and Cellular bars) only transitioned from bad to good once. With this
change it can transition back to bad (and later to good again) if a network
re-evaluation is triggered, say by ConnectivityManager.reportBadNetwork.
Also, avoid triggering re-evaluation in two unwanted cases.
bug:16214361
Change-Id: I7856724249ffcbb0945276dcf45019876231fdaf
2014-09-12 23:02:28 +00:00
Craig Mautner
2ade126e62
Rework the task affiliate chain validation
...
The old chain was problematic. It started verification at the end of
the chain and then went no further. Then it went back down the
chain to the beginning with no checks. It also removed entries and
tried to add them back past the end of the ArrayList during boot
which caused the system process to shut down.
This method uses the ordering imposed by taskIds which is the same
order that the tasks were created. It fixes up and notes dropped
links and then reconstructs the list correctly.
Fixes bug 17467284.
Change-Id: I746ec2cdcc7ac6403278cfefc7a6db9b5549d226
2014-09-12 16:01:21 -07:00
Jeff Sharkey
c713bf79dd
Merge "Fix boot loop when deriving device name." into lmp-dev
2014-09-12 23:00:48 +00:00
Robert Greenwalt
61642ce8c3
Merge "Better handling of unvalidated networks." into lmp-dev
2014-09-12 23:00:37 +00:00
Jeff Sharkey
69aada9c7f
Merge "Add xxxhdpi assets for DocumentsUI." into lmp-dev
2014-09-12 23:00:06 +00:00
George Mount
72b9c1491e
am 17506bdb: Merge "Allow Path Animations to support overshooting." into lmp-dev
...
* commit '17506bdb89a323a31e27cbff24fec4c819a71582':
Allow Path Animations to support overshooting.
2014-09-12 22:58:53 +00:00
Dianne Hackborn
3ca644f1b4
am 8b01fb7e: Merge "Fix issue #17479850 : AppOpsManager.checkPackage() allows..." into lmp-dev
...
* commit '8b01fb7eeeec0431cfb5f51e191a1418423f88ed':
Fix issue #17479850 : AppOpsManager.checkPackage() allows...
2014-09-12 22:58:48 +00:00
Jean-Michel Trivi
04f55a490d
more AudioAttributes javadoc
...
Expand the AudioAttributes and associated Builder javadoc.
Bug 17059703
Change-Id: I81b8d48a3b5b3c203f02da3e37228e5ef7b5451d
2014-09-12 15:56:46 -07:00
Jeff Sharkey
ad59c43072
Fix boot loop when deriving device name.
...
Bug: 17490408
Change-Id: If1cc25a341eed4e41a7bf170bab077203fa19d15
2014-09-12 15:56:30 -07:00
Adam Powell
eb865e9545
am af7ba5de: Merge "Add contentDescription for material action mode close button" into lmp-dev
...
* commit 'af7ba5dee4454f946ba8e2a3a87205a07bf63171':
Add contentDescription for material action mode close button
2014-09-12 22:49:48 +00:00
Tsuwei Chen
3ba9b1254a
am 4290fb7b: Merge "Handle user privacy properly during network initiated requests. Bug: 16131208" into lmp-dev
...
* commit '4290fb7b4499c5ec01a6df3a20de7a8fd63bdd97':
Handle user privacy properly during network initiated requests. Bug: 16131208
2014-09-12 22:49:43 +00:00
Dianne Hackborn
760a86e49a
am a561b237: Merge "Allow throwing UnsupportedOperationException across Binder." into lmp-dev
...
* commit 'a561b2377fd1f8749a30fe19d6df5e3d8afc3292':
Allow throwing UnsupportedOperationException across Binder.
2014-09-12 22:49:33 +00:00
George Mount
64ec46dbb0
Merge "Allow Path Animations to support overshooting." into lmp-dev
2014-09-12 22:48:28 +00:00
George Mount
bc68f5adc2
Allow Path Animations to support overshooting.
...
Bug 17458698
Change-Id: I7a29fc8932a28121d7db8b3bf695d91a55ef059b
2014-09-12 15:46:02 -07:00
Eric Laurent
75b433f737
SoundTrigger: fix KeyphraseRecognitionEvent parceling
...
Always include the Audioformat in the parcel if not
null.
Bug: 17489186.
Change-Id: I8bea031942b55078e5637959d5bf70961d134733
2014-09-12 15:45:47 -07:00
Dianne Hackborn
39b278798e
Merge "Fix issue #17479850 : AppOpsManager.checkPackage() allows..." into lmp-dev
2014-09-12 22:45:01 +00:00
Adam Powell
457b62d923
Merge "Add contentDescription for material action mode close button" into lmp-dev
2014-09-12 22:43:46 +00:00
Dianne Hackborn
0fcef84cca
Fix issue #17479850 : AppOpsManager.checkPackage() allows...
...
...root or shell to claim any package name
Re-arrange so checkPackage() doesn't go through the path where
the package name will be forced for root and shell uids.
Change-Id: I450cd6ac8148afd75b526724afdf46ab63de4c43
2014-09-12 15:38:33 -07:00
Tsuwei Chen
ae69f9fdb3
Merge "Handle user privacy properly during network initiated requests. Bug: 16131208" into lmp-dev
2014-09-12 22:36:53 +00:00
Dianne Hackborn
8190b79d37
Merge "Allow throwing UnsupportedOperationException across Binder." into lmp-dev
2014-09-12 22:35:48 +00:00
Svetoslav
ba46eb6b6d
am 60eed0e5: Merge "Fix crash in spooler if printing app dies." into lmp-dev
...
* commit '60eed0e500c2d5964431d9afd6b72b40040448ed':
Fix crash in spooler if printing app dies.
2014-09-12 22:31:39 +00:00