Commit Graph

176611 Commits

Author SHA1 Message Date
Narayan Kamath
43395d677b am 68e9af7b: am 1d84709c: Merge "Stop reading Settings.System.DATE_FORMAT."
* commit '68e9af7ba0b846768036f268d719f3d2a333ffca':
  Stop reading Settings.System.DATE_FORMAT.
2014-11-24 16:19:04 +00:00
Jeff Davidson
7842f64b75 Handle package changes in NetworkScoreService.
Keep a registered receiver for changes to the active scorer package
when scoring is enabled. Disable scoring if any of those changes cause
the active scorer to become invalidated.

Covers the package or subcomponent being disabled, the package being
upgraded to a version that is no longer a valid scorer, or the package
being uninstalled. Intentionally keeps scoring active if the package
is upgraded and the new package is still a valid scorer.

Bug: 18494565
Change-Id: I1d340820b12881ab2ee147a788773df9cc7005d7
2014-11-24 08:15:28 -08:00
Narayan Kamath
68e9af7ba0 am 1d84709c: Merge "Stop reading Settings.System.DATE_FORMAT."
* commit '1d84709cf4d320a3e57cd16db144262b1fc2c3d7':
  Stop reading Settings.System.DATE_FORMAT.
2014-11-24 16:15:13 +00:00
Narayan Kamath
32ed090f5a Merge "Stop using DATE_FORMAT from settings." 2014-11-24 16:14:33 +00:00
Paul Jensen
71b645fe9c Don't let NetworkMonitor state stop user-initiated transitions.
GCM can call reportInetCondition() at any time which can cause
the NetworkMonitor to transition states to reevaluate at any time.
Previously we were only listening for users clicking the sign-in
notificaiton or completing sign-in when in the appropriate state.
With this change NetworkMonitor's state does not stop us from
listening for the user's actions.

bug:17917929
Change-Id: Ic1da31d90f7090e5fc111874cb7c37d505aaf590
2014-11-24 11:11:32 -05:00
Narayan Kamath
1d84709cf4 Merge "Stop reading Settings.System.DATE_FORMAT." 2014-11-24 16:10:02 +00:00
Adrian Roos
20eb594ab2 am 8a924242: Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev
* commit '8a9242428b9d631ba841c166d062f158fd64f0f6':
  Revert "Only keep user switcher bitmaps if needed"
2014-11-24 16:08:41 +00:00
Adrian Roos
9b4b2940b7 am 07361c84: Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev
* commit '07361c8488aa600573c21e27f728c22d44760ecf':
  Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045
2014-11-24 16:08:36 +00:00
Narayan Kamath
f91f06a599 Stop reading Settings.System.DATE_FORMAT.
Also, move over DateFormat.getInstance(SHORT) instead of
LocaleData.shortDateFormat4 (which forces 4 digit years).
Based on an analysis of git history, there seems to be no
real motiviation for using 4 digit years.

If anyone in the platform complains loudly, we could look at
using a skeleton pattern instead of just replacing 'y' with 'yy'.

If third party apps are affected, we could add a targetSdkversion
based check and revert to the old behaviour for older targetSdks.

bug: 18388178
bug: 18322220
Change-Id: Ieab2b41691958a2e668d382c5a6b3d9aaf741ed2
2014-11-24 16:05:19 +00:00
Adrian Roos
520d20c1a8 am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev
* commit '702d9e31b1bcacff975a2b8e0d04160bbd6811ed':
  Fix DPM.resetPassword("")
2014-11-24 16:04:13 +00:00
Christoph Studer
30646d87f2 am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev
* commit '671424951dcd2a0d1059c6d899a8649cbc8b5e26':
  Fix MediaStyle API comments
2014-11-24 16:04:08 +00:00
Chris Wren
865c73b5f6 am 1aa63f0b: Merge "Push back notification means snooze the package." into lmp-mr1-dev
* commit '1aa63f0baf0df58ae22ecb2558a5de7cebd38654':
  Push back notification means snooze the package.
2014-11-24 16:04:00 +00:00
Adrian Roos
8a9242428b Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev 2014-11-24 16:03:56 +00:00
Adrian Roos
07361c8488 Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev 2014-11-24 16:03:43 +00:00
Adrian Roos
702d9e31b1 Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 2014-11-24 16:02:11 +00:00
Christoph Studer
671424951d Merge "Fix MediaStyle API comments" into lmp-mr1-dev 2014-11-24 16:00:38 +00:00
Chris Wren
1aa63f0baf Merge "Push back notification means snooze the package." into lmp-mr1-dev 2014-11-24 15:58:17 +00:00
Chris Wren
ce00a234ed LED should not be blocked by interruption filtering.
Bug: 17204854
Change-Id: Ife30c2ebbcf3fce87ac262dbd339b694d4a57728
2014-11-24 10:53:46 -05:00
Geoff Mendal
41d3e943a7 am ae71b002: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'ae71b0027f5de71a947bc988ebd1c409e73063e0':
  Import translations. DO NOT MERGE
2014-11-24 15:35:12 +00:00
Geoff Mendal
c0bbb2f880 Merge "Import translations. DO NOT MERGE" 2014-11-24 15:34:26 +00:00
Geoff Mendal
c3ab889f9e Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-24 15:33:36 +00:00
Geoff Mendal
ae71b0027f Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-24 15:30:49 +00:00
Geoff Mendal
c6a1070bd6 am 9be80ee5: (-s ours) Import translations. DO NOT MERGE
* commit '9be80ee53ff5a3df51537f10b3d63f1f7f0ccd3e':
  Import translations. DO NOT MERGE
2014-11-24 15:27:02 +00:00
Geoff Mendal
9be80ee53f Import translations. DO NOT MERGE
Change-Id: I0cddd5a38892d51d9ceb338f039e360dddc877bf
Auto-generated-cl: translation import
2014-11-24 07:13:23 -08:00
Geoff Mendal
b80417303f Import translations. DO NOT MERGE
Change-Id: I99aa8bb6f0cd916b4ea4e4621a175cad9d43c3af
Auto-generated-cl: translation import
2014-11-24 06:29:27 -08:00
Geoff Mendal
d2fd0410d9 Import translations. DO NOT MERGE
Change-Id: Ib6f35d7fd27aa2503ee0e1038e1048c989bf31af
Auto-generated-cl: translation import
2014-11-24 06:25:15 -08:00
Geoff Mendal
905e20855b Import translations. DO NOT MERGE
Change-Id: Ib51df7dd1177be11dbe75dc983866a9cfdf74511
Auto-generated-cl: translation import
2014-11-24 06:21:48 -08:00
Geoff Mendal
3521518dbc Import translations. DO NOT MERGE
Change-Id: I1b7255d3a1bda752665435e6a1113c735dc0702d
Auto-generated-cl: translation import
2014-11-24 06:20:00 -08:00
Christoph Studer
e935fe918e Fix MediaStyle API comments
Bug: 17805819
Change-Id: Ie45a43d7ae99304d635ce75aeb32a6d4d4e3e57d
2014-11-24 14:18:06 +01:00
Zoltan Szatmary-Ban
8e55c4bff8 am 604aec95: Merge "Add new subcommand \'set-active-admin\' to the dpm command." into lmp-mr1-dev
* commit '604aec9574212aabb3391585799a72e6820466cd':
  Add new subcommand 'set-active-admin' to the dpm command.
2014-11-24 12:13:15 +00:00
Zoltan Szatmary-Ban
604aec9574 Merge "Add new subcommand 'set-active-admin' to the dpm command." into lmp-mr1-dev 2014-11-24 12:08:20 +00:00
Dohyun Lee
adc0d9da86 Enable stencil clipping within clearLayerRegions
Previously stencil clipping within clearLayerRegions is disabled by commit
62d307c240. However, clearing whole layer
regions causes black-colored triangle regions when a TextView has
RotateAnimation because the draw within clearLayerRegions does not
affected by the current stencil clip.

Change-Id: Id32a0b16754b109905f833e063ebfa156bd953f2
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com>
2014-11-24 21:08:15 +09:00
Selim Cinek
f0fc23a141 am 962b06f9: Merge "Fixed several time related states for secondary users" into lmp-mr1-dev
* commit '962b06f9a02f08392b6f87225a314ebf39dd7a07':
  Fixed several time related states for secondary users
2014-11-24 11:57:59 +00:00
Selim Cinek
962b06f9a0 Merge "Fixed several time related states for secondary users" into lmp-mr1-dev 2014-11-24 11:52:40 +00:00
Robin Lee
0d5ccb7378 Ensure that private key is PKCS#8-encoded
getEncoded() is not requred to return a PKCS#8-encoded result.

Bug: 15065444
Change-Id: I1278ff9ffffe5887f149bae9288a174beed5f86a
2014-11-24 10:10:39 +00:00
Jinsuk Kim
546d867cb8 CEC: Do not issue non-effective <Routing Change>
CEC command <Routing Change> should not be issued if old and new path
are identical since it not only have no effect but also can lead certain
devices to taking unexpected action.

Bug: 18283251
Change-Id: I7a210b7aa20ce4b96ef0d260c4abfc10d4393e63
2014-11-24 11:51:35 +09:00
a20023
bcb78eec88 Set network selection to automatic when in Global mode
Verzion requests that network selection should be set to automatic when 
network mode is global.

Bug: 18372726
Change-Id: I58aae223e15351efc3f58a938630f0aa9600537e
2014-11-24 02:34:08 +00:00
Bernhard Rosenkränzer
57f637279a Add -Wno-unused-parameter to LOCAL_CFLAGS
Some JNI functions ignore the JNI environment and class information, but
still take the parameters -- causing a build failure with clang (and gcc
with -Wextra enabled). Ignore this.

Change-Id: I049fcf65991b19d2416fce105699311803b43cfc
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-24 03:02:03 +01:00
Jeff Davidson
df9ca46979 Fix WifiTile's Connected indicator for ephemeral networks.
Such networks do not have a WifiConfiguration and need to be matched
by SSID.

Note a subtle difference with platform settings: in platform settings,
selecting an ephemeral network saves it for future use. That feels out
of place here, where normally clicking on the connected network does
nothing.

Bug: 18489098
Change-Id: I6aebd14054af47f078ffd8d754668817dff90436
2014-11-23 15:59:55 -08:00
Bernhard Rosenkränzer
4048a4bcb1 Remove unused variables and functions, don't warn about unused parameters
Remove unused variables and static functions clang complains about,
disable warnings about unused parameters (needed for clang and for gcc
with -Wextra enabled)

Change-Id: I76a22cd0158b3c7375c54e3d4d15bc1ac448591e
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-23 22:24:32 +01:00
Wink Saville
4f1cce6306 am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
* commit '12c2136e556b54a717624d8479ec4650f363ce45':
  Additional changes to SubscriptionManager API as per API council.
2014-11-22 20:28:10 +00:00
Wink Saville
12c2136e55 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-22 20:19:25 +00:00
Wink Saville
d09c4cad65 Additional changes to SubscriptionManager API as per API council.
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
2014-11-22 10:08:16 -08:00
Svet Ganov
f6cd14dbc9 Print spooler crash when printing after a rotation.
1. Available printers are provided by a loader driven by the activity
   lifecycle. After a rotation of an app that does not handle rotation
   the print activity is destroyed in a delayed fashion. When another
   print task is started the loader of the destroed activity gets two
   cancellations, one when the activity is stopped and one when it is
   destroyed but when the second cancellation happens the loader has a
   bad state that it is loading while it is not and a NPE occurs.

2. If a rotation happens early before the print activity is fully initialized
   (there are asyncrconous operations that take place) we get a NPE as
   the print preview controller is not created yet.

3. A lockup of the print preview process occurs if the print print
   activity is destroyed after we initiated binding to the rendering
   service but before we receive the remote interface. In this case no
   remote service is received as exepcted since we already unbound from
   it resulting in a missed signal.

bug:18238590

Change-Id: I81817d81702f649ded97dfbab7d7bba28f22fa91
2014-11-22 09:28:38 -08:00
Elliott Hughes
476edb5701 am ee46d162: am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN."
* commit 'ee46d1621f817d626e8dd42e9ffe7051f4a829eb':
  We HAVE_LITTLE_ENDIAN.
2014-11-22 08:04:38 +00:00
Elliott Hughes
ee46d1621f am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN."
* commit '08e2fd7238c50b5d06af41bc944ee08acb023d51':
  We HAVE_LITTLE_ENDIAN.
2014-11-22 07:56:46 +00:00
Elliott Hughes
08e2fd7238 am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN."
* commit 'ff4dd15cd024f72cbd2b6d547356de030b2dd71c':
  We HAVE_LITTLE_ENDIAN.
2014-11-22 07:50:58 +00:00
Elliott Hughes
ff4dd15cd0 Merge "We HAVE_LITTLE_ENDIAN." 2014-11-22 07:47:27 +00:00
Elliott Hughes
9d074a1fb7 We HAVE_LITTLE_ENDIAN.
Change-Id: I5b5d0ef3f91fe84d629d2ddac436bd22019edfd4
2014-11-21 23:36:45 -08:00
Lajos Molnar
63845f1b58 am c398f175: Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev
* commit 'c398f175cdc2ceb31bc45b6541f7cd9c3c52406a':
  media: fix isSupportedFormat for integer frame rate
2014-11-22 06:02:51 +00:00