19864 Commits

Author SHA1 Message Date
Sreeram Ramachandran
624a205e74 Merge "Unescape strings properly in NsdService." into lmp-dev 2014-09-05 22:26:20 +00:00
Christopher Tate
a0c9962388 Merge "Don't crash in addPackageHoldingPermissions()..." into lmp-dev 2014-09-05 22:23:07 +00:00
dcashman
522f671eb0 Merge "Fix boolean comparison after sig check." into lmp-dev 2014-09-05 22:18:50 +00:00
Christopher Tate
30f349d2ef Don't crash in addPackageHoldingPermissions()...
...in cases involving uninstalled apps, or apps whose install state
varies across different users.

Bug 17398315

Change-Id: I7297d82f8bf5d49c50a7fd53d795a706bf2d2313
2014-09-05 21:58:32 +00:00
Griff Hazen
69dd40d08a Merge "Reduce chance of notification listener dropped messages." into lmp-dev 2014-09-05 21:52:44 +00:00
dcashman
2de4f9f971 Fix boolean comparison after sig check.
Bug: 17402843
Change-Id: I0cb5ffba1a93f71a250294a41040011234ce1029
2014-09-05 14:45:46 -07:00
Carlos Valdivia
605e71922e Merge "We shouldn't delete accounts when a package is being updated." into lmp-dev 2014-09-05 21:01:53 +00:00
Carlos Valdivia
23f58260bd We shouldn't delete accounts when a package is being updated.
Bug: 17158237
Change-Id: Icbf9e672a6a698737b08ed39c78a64c161a7b802
2014-09-05 13:58:31 -07:00
Sreeram Ramachandran
ef12884da7 Unescape strings properly in NsdService.
NativeDaemonEvent.unescapeArgs() was improperly skipping the terminating
quote in cases like "\\", where the char preceding the quote is a
backslash, but the backslash itself is escaped, so the quote is indeed
an unescaped terminator.

unescapeArgs() doesn't unescape "\xxx" decimal escapes used by mDNS, so
fix NsdService to do that sort of unescaping explicitly (which is only
applicable when it receives a "fullname", in SERVICE_RESOLVED).

Bug: 16983542
Bug: 16986203

Change-Id: Idfa79749336c68424d961bc414f984c525b7e5e6
2014-09-05 20:31:46 +00:00
Michael Wright
a6863ad622 Merge "Allow for event dispatching when in non-interactive states." into lmp-dev 2014-09-05 19:58:12 +00:00
RoboErik
77a634503f Merge "send volume button events to adjustSuggestedStream instead of adjustStream" into lmp-dev 2014-09-05 19:49:56 +00:00
Amith Yamasani
4b278afa0d Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev 2014-09-05 19:43:44 +00:00
RoboErik
272e161c1a send volume button events to adjustSuggestedStream instead of adjustStream
This way the audio system can route the adjustments correctly when a bt
headset is connected.

bug:17281977
Change-Id: Ic41d038e47179baffc86e539562da285446148c7
2014-09-05 12:37:39 -07:00
Jeff Sharkey
43a2d06166 Merge "Allow badging updates to install sessions." into lmp-dev 2014-09-05 17:56:39 +00:00
Amith Yamasani
51a0e5b546 Rename getLocalApprovalIntent to createLocalApprovalIntent
Based on API review.

Bug: 17389920
Change-Id: I84674f25a84d317f017473b6f4ac19c849079323
2014-09-05 10:51:13 -07:00
Jeff Sharkey
ec9bad2015 Allow badging updates to install sessions.
For the system restore use-case, an installer may need to enqueue
their sessions quickly before badging details, like icons, have been
downloaded.  This change relaxes to allow an installer to update
their session badging after the session has been created.  Notify
observers when badging changes.

Rename callback registration methods to match style guide.  Relax
constraint that observers are home app.  Fix bug around internal
progress reporting.

Bug: 17376797, 17389236, 17334199
Change-Id: I5fb88508baea2f08e89a1504fcf5ef972afad4a7
2014-09-05 10:15:15 -07:00
Amith Yamasani
a240d8377a Merge "Don't allow guests to install from unknown sources" into lmp-dev 2014-09-05 16:32:30 +00:00
Chris Wren
c237555c6c Merge "Keep contact affinities separate across users." into lmp-dev 2014-09-05 14:58:40 +00:00
Chris Wren
da4bd209cf Keep contact affinities separate across users.
Also ignore people extras on USER_ALL notifications.

Bug: 16213960
Change-Id: Ic0341c88d42d4a4f12cac35c0f41c2746aec02ac
2014-09-05 10:36:32 -04:00
Christoph Studer
7f579fda4b Merge "NoMan: Fix speedbump for PRIORITY_MIN intrusives" into lmp-dev 2014-09-05 14:11:52 +00:00
Christoph Studer
327bf78a7d NoMan: Fix speedbump for PRIORITY_MIN intrusives
Bug: 16782616
Change-Id: I35fb875bed8cbd90ecd37edc8973c1771be3584d
2014-09-05 14:11:37 +00:00
Jason Monk
b836ddef15 Merge "Allow downtime to exit from no interruptions" into lmp-dev 2014-09-05 13:39:23 +00:00
Brian Carlstrom
839849111c Merge "Fix backwards arguments to performDexOpt" into lmp-dev 2014-09-05 07:25:37 +00:00
Brian Carlstrom
d382be9b22 Fix backwards arguments to performDexOpt
Bug: 16696554
Change-Id: I302f8edc8243d3537afd564599cc798708124dbe
2014-09-05 00:07:25 -07:00
Jungshik Jang
71cc3b8e84 Merge "Prevent sending <Feature Abort> for some messages." into lmp-dev 2014-09-05 05:25:37 +00:00
Michael Wright
70af00abf7 Allow for event dispatching when in non-interactive states.
We need to allow for event dispatching in non-interactive states so
that we can enable a richer set of interactions when a device is
dozing (i.e. is in a low power state with an Always-on-Display).

Bug: 17167296
Change-Id: I8ae0f544a8106cb91ff38c2309b8b57cbe2f2c72
2014-09-04 19:48:39 -07:00
Svetoslav
a88e8926ab Merge "Handle user changes off the main thread." into lmp-dev 2014-09-05 02:02:47 +00:00
Svetoslav
c82768ff4b Handle user changes off the main thread.
The remote print spooler can only be accessed off the main thread
by design as calls into it may block for a short amoun of time since
the frist call into the spooler may have to wait for the system to
bind to the spooler service. A recent change introduced a regression
where the user state changes are now dispatched on the main thread.
This change schedules the user change handling to a background handler
thread.

bug:17396682

Change-Id: I059be8f31ba41122cb2967d8afadd19e6b5a08e5
2014-09-04 18:57:05 -07:00
Craig Mautner
46edee0994 Merge "Prevent recursion in resumeTopActivityLocked" into lmp-dev 2014-09-05 00:59:46 +00:00
Alan Viverette
15aebbbe53 Merge "Don't switch to touch exploring state on pointer up" into lmp-dev 2014-09-05 00:54:42 +00:00
Craig Mautner
544efa7663 Prevent recursion in resumeTopActivityLocked
The existing recursion in resumeTopActivityLocked() finally caused
a problem by attempting to pause the same activity twice. By
preventing the recursion with this change we no longer face that
problem.

Fixes bug 17260463.

Change-Id: I0954614fc1a7dc0eeeef9335c1b973a42a7fc345
2014-09-04 17:37:15 -07:00
Jungshik Jang
4480efa05a Prevent sending <Feature Abort> for some messages.
This change fixes the following cases.
- <Report Power Status>(0x90)
-  When TV receives <Report Power Status> as a reply of <Give Device Power Status>, TV does not send <Feature Abort>. But if a device sends <Report Power Status> actively, TV sends <Feature Abort>.
-  <Set System Audio Mode>(0x72)
-  <System Audio Mode Status>(0x7E) Directly address message is also defined.
-  <Record Status>(0x0A) (We will support One-touch record function at least in Japan)
-  <Timer Status>(0x35) (We will support Timer programming function at least in Japan)
-  No response for <Record TV Screen>(0x0F)

Bug: 17382769
Change-Id: I8ae355337757710d54b788edfdf37293f96cfa97
2014-09-05 08:50:02 +09:00
Jungshik Jang
f4df7656b9 Merge "CEC: Revamp volume control action." into lmp-dev 2014-09-04 23:47:03 +00:00
Ye Wen
70afe9ee84 Merge "MMS API cleanup (1/4)" into lmp-dev 2014-09-04 23:36:00 +00:00
Nick Kralevich
9ce72731f2 Merge "AppWidgetServiceImpl: Use enforceCallingOrSelfPermission for checking DUMP" into lmp-dev 2014-09-04 23:36:00 +00:00
Jungshik Jang
2e8f1b6399 CEC: Revamp volume control action.
Here is a list of changes
1. Change volume control into event base not level base
2. Hide volume ui if volume change is triggered by CEC
3. Report volume change triggered by CEC in OSD message
4. Revamp HdmiLogger so that normal class uses static method only.
5. Apply format message to HdmiLogger's helper methods.

Bug: 17367215

Change-Id: I9f3cd41f7c66f76919059b463df956ed5176b054
2014-09-05 08:30:19 +09:00
Jeff Sharkey
fd12f4c9e4 Merge "Hold package cleaning until system is ready." into lmp-dev 2014-09-04 22:49:17 +00:00
Amith Yamasani
7767df3c9c Merge "Fix crash if package setting is not populated yet" into lmp-dev 2014-09-04 22:47:51 +00:00
Ye Wen
8179c2a6e4 MMS API cleanup (1/4)
- Hide APIs not approved by API council (b/17189780)
- Change configOverrides in MMS APIs from ContentValues to Bundle to be
consistent (b/17390017)
- Change SmsManager.MMS_EXTRA_DATA to EXTRA_MMS_DATA per API council
review (b/17390977)

b/17189780
b/17390017
b/17390977

Change-Id: If5a43e9ab9e42b6328f1581b39051ddf1a58f0dd
2014-09-04 15:41:56 -07:00
Nick Kralevich
75d8c0b8bc AppWidgetServiceImpl: Use enforceCallingOrSelfPermission for checking DUMP
Use enforceCallingOrSelfPermission() for throwing a security exception
rather than creating the security exception ourselves. This has the
advantage that the exception is in a well known format expected by
the CTS test android.security.cts.ServicePermissionsTest#testDumpProtected

Bug: 17165920
Change-Id: I7d3c2d2a0852a490fe1d553cd81d1efc79d2fec3
2014-09-04 15:07:18 -07:00
Dianne Hackborn
c50e7e8477 Merge "Fix issue #17175312: Calendar crashed when tapping on the event notification" into lmp-dev 2014-09-04 21:40:31 +00:00
Amith Yamasani
43789f5614 Fix crash if package setting is not populated yet
Bug: 17388687
Change-Id: I441ec37396a3b725a79b933a182c63fbe52d5646
2014-09-04 14:00:49 -07:00
Craig Mautner
127343cb46 Merge "Eliminate deadlock by deferring wipe data call" into lmp-dev 2014-09-04 20:41:39 +00:00
Adam Lesinski
430f5680b6 Merge "Add Configuration changes to UsageStats" into lmp-dev 2014-09-04 20:35:51 +00:00
Alan Viverette
d2b3e034d1 Don't switch to touch exploring state on pointer up
BUG: 17388688
Change-Id: I146aa2290acf0a587eaccafa5a208ee1cbd84aa5
2014-09-04 13:18:44 -07:00
Craig Mautner
66eb521833 Eliminate deadlock by deferring wipe data call
The call to RecoverySystem.rebootWipeUserData() was made while
holding the lock to DevicePolicyManagerService. But it blocks
waiting for system_process' main thread to receive the ordered
broadcast complete callback. It won't receive that callback
because Keyguard is running on the main thread and is concurrently
blocked on DevicePolicyManagerService.

By moving the call to rebootWipeUserData() out of the synchronized
block the deadlock is eliminated.

Fixes bug 16870054.

Change-Id: I3eb587211e5484859cc9dab7e80e5a1f6c85225d
2014-09-04 12:56:39 -07:00
Adam Lesinski
7f61e96db7 Add Configuration changes to UsageStats
Bug:17354208
Change-Id: I9b2f595e51b656607e30e798926cfb7e25134944
2014-09-04 12:15:32 -07:00
dcashman
977c5bec52 Merge "Add upgrade KeySets check to permission pruning on install." into lmp-dev 2014-09-04 18:39:35 +00:00
Svetoslav
f96f52ea51 Merge "Fix collection iteration index." into lmp-dev 2014-09-04 18:39:02 +00:00
Dianne Hackborn
925e2b3352 Fix issue #17175312: Calendar crashed when tapping on the event notification
mActivities can be null.

Change-Id: I9cc1a08d19d2c38a4ebaaf0ed2168cfbeeaf3b51
2014-09-04 11:26:09 -07:00