Commit Graph

164750 Commits

Author SHA1 Message Date
Dianne Hackborn
2bbea56d12 Merge "Final resource IDs." into lmp-mr1-dev 2014-11-24 17:54:06 +00:00
Dianne Hackborn
5bbb1af74a Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 2014-11-24 17:53:50 +00:00
Jeff Brown
8cac73097e am b5686d55: am 3d110b23: Make WallpaperService watch the actual display state.
* commit 'b5686d55963e76c801ca0581a1012c5f4aa8d009':
  Make WallpaperService watch the actual display state.
2014-11-24 17:40:02 +00:00
Tom Taylor
86201db27e Issues with messaging apps on non-primary user account
Bug 18399514

Adjust the contentUri to contain the caller's userId so that when
the phone process tries to open the Uri, it will open the provider
on the correct user.
Also make sure the Uri grants are properly qualified. We only need to grant
permission for sending. Receiving an MMS is always done by the primary
user and doesn't need special permissions. Move various permission grants
from the SmsManager to here.

Change-Id: Ib192f651ab05db9f07e9e6245bb343ed7a55b18e
2014-11-24 09:36:43 -08:00
Jeff Brown
b5686d5596 am 3d110b23: Make WallpaperService watch the actual display state.
* commit '3d110b239153a6c7423a99f02ef859201205eee2':
  Make WallpaperService watch the actual display state.
2014-11-24 17:34:32 +00:00
Sreeram Ramachandran
608ea32286 am 6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev
* commit '6d0e8711d0612cfc9d9db2def57541076c0f7a40':
  Delete unused/non-working code.
2014-11-24 17:28:14 +00:00
Sreeram Ramachandran
4096a3107b am 45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev
* commit '45e27327178be9d5524cfcbdde9bb83502668e46':
  Allow VPNs to specify their underlying networks.
2014-11-24 17:28:09 +00:00
John Spurlock
beaf117889 QS: Update data usage over limit title.
Bug: 18499916
Change-Id: I468eb40cbbbef52853c52e196e458d72f103765a
2014-11-24 12:25:32 -05:00
smain@google.com
43eabc8f13 add intro videos (w/ shadowbox) to Auto and Wear landing pages.
Change-Id: Ieb730416b7a469c7cbd0e80d1e9f74f14a7adb70
2014-11-24 09:25:00 -08:00
Sreeram Ramachandran
6d0e8711d0 Merge "Delete unused/non-working code." into lmp-mr1-dev 2014-11-24 17:24:26 +00:00
Sreeram Ramachandran
45e2732717 Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 2014-11-24 17:24:04 +00:00
Sreeram Ramachandran
1d16570b37 am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev
* commit 'aaea7e81141f4feb6cf5804b815567247b9c1f3a':
  Eliminate race conditions in UID-based network filtering.
2014-11-24 17:23:52 +00:00
Sreeram Ramachandran
aaea7e8114 Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 2014-11-24 17:21:18 +00:00
Geoff Mendal
1df8d4c5e0 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-24 16:56:49 +00:00
Geoff Mendal
234e25fbda Import translations. DO NOT MERGE
Change-Id: Ia6e19184b9f8f2ef31f1ea94263fe1090333837e
Auto-generated-cl: translation import
2014-11-24 08:51:30 -08:00
Geoff Mendal
0d138dd11a Import translations. DO NOT MERGE
Change-Id: I0faffa6e483c6dd763c39006825281b188b53443
Auto-generated-cl: translation import
2014-11-24 08:42:25 -08:00
Jorim Jaggi
fc4d8043de am f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev
* commit 'f510a8a688acf08378419aae20d2be25b88a4397':
  Tint SIM images in PIN/PUK screen
2014-11-24 16:30:13 +00:00
Jorim Jaggi
f510a8a688 Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev 2014-11-24 16:26:03 +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
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
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
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
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
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
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
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
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
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
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