drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
182,307 Commits 1 Branch 0 Tags
Commit Graph

24850 Commits

Author SHA1 Message Date
Craig Mautner
bf6af73de6 am 604a9e28: am 5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev 
* commit '604a9e280e8273f6ed1f1a50724c0d510cf09bb0':
  Defer tap outside stack until multiwindows
 2015-01-27 21:00:29 +00:00
Craig Mautner
604a9e280e am 5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev 
* commit '5426e7ae93e0e728e0e12bc98a02c957d464cfe0':
  Defer tap outside stack until multiwindows
 2015-01-27 20:54:42 +00:00
Craig Mautner
5426e7ae93 Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev 2015-01-27 20:48:55 +00:00
Fyodor Kupolov
703d1c43a2 Added primaryUserOnly attribute for activities 
In addition to receivers, primaryUserOnly is now supported for activities.

In queryIntentActivities method, activities with primaryUserOnly flag set will
be filtered out, when current user is not the owner.

Change-Id: I0b7168b8c96749cd6d23b8c95d5624589f5f2d86
 2015-01-27 12:05:07 -08:00
Craig Mautner
baf6bef001 Defer tap outside stack until multiwindows 
Taps outside of the stack boundary were causing the current app to
lose focus. This led to timeouts waiting for the app to respond.

Disabling the tap recognition keeps the focus from changing. It will
be reenabled for multiwindows.

Fixes bug 17721767.

Change-Id: Iad854b19979390e73b97239e489ad7ef82e03d47
 2015-01-27 11:44:59 -08:00
Craig Mautner
9933b3136e am 603d30b1: Merge "Stop logging service starts and stops." into lmp-mr1-dev automerge: 49880ee 
automerge: 8e72aa8

* commit '8e72aa8a41cf1395ce30a9f0c9416587d64b5ba9':
  Stop logging service starts and stops.
 2015-01-27 17:55:31 +00:00
Wonsik Kim
1bc966d94d am b3c06e49: Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev automerge: cd8a80c 
automerge: ae3e5e8

* commit 'ae3e5e82b6d36aa49cd9da7d89f6943fe92b1d41':
  TIF: fix loud volume after input switch when volume is 0
 2015-01-27 17:54:20 +00:00
Wale Ogunwale
60454dbc4d Support activities in the same process having different resources. 
Activities can be of various sizes in a multi-window environment.
This change allows them to have override configurations that allows
different resources to the loaded if needed.

Bug: 19002213
Change-Id: Ib2c7be0b427f5ce05e7a362bcdd496ddbc9164f0
 2015-01-27 07:50:58 -08:00
Lorenzo Colitti
94615260a8 am b84e0040: am 525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev 
* commit 'b84e0040d8c2f44790e7ceeda8cddf3524f33d29':
  Make NetworkMonitor less aggressive on broken networks.
 2015-01-27 11:55:51 +00:00
Lorenzo Colitti
b84e0040d8 am 525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev 
* commit '525588c593794cf52d93665e9cf55f06abd3d1b7':
  Make NetworkMonitor less aggressive on broken networks.
 2015-01-27 11:46:31 +00:00
Lorenzo Colitti
525588c593 Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev 2015-01-27 11:41:10 +00:00
Craig Mautner
8e72aa8a41 am 603d30b1: Merge "Stop logging service starts and stops." into lmp-mr1-dev automerge: 49880ee 
* commit '603d30b1cfe7be61e4e352b58342b86e5cfb7612':
  Stop logging service starts and stops.
 2015-01-27 01:47:16 +00:00
Wonsik Kim
ae3e5e82b6 am b3c06e49: Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev automerge: cd8a80c 
* commit 'b3c06e49c8e286f8960be65c3e96934ea2ab8b49':
  TIF: fix loud volume after input switch when volume is 0
 2015-01-27 01:47:11 +00:00
Craig Mautner
603d30b1cf Merge "Stop logging service starts and stops." into lmp-mr1-dev 
automerge: 49880ee

* commit '49880eeb00c71a2287db65717fd8a7ff5e87279d':
  Stop logging service starts and stops.
 2015-01-27 01:41:15 +00:00
Wonsik Kim
b3c06e49c8 Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev 
automerge: cd8a80c

* commit 'cd8a80c7077ee1ef14888e1a735b20c7119c1aac':
  TIF: fix loud volume after input switch when volume is 0
 2015-01-27 01:39:56 +00:00
Craig Mautner
49880eeb00 Merge "Stop logging service starts and stops." into lmp-mr1-dev 2015-01-27 01:15:35 +00:00
Wonsik Kim
485e7e13f4 TIF: fix loud volume after input switch when volume is 0 
Bug: 19134440
Change-Id: I6291f299a27315e79b505ea36bf96c79437e6b53
 2015-01-27 01:06:37 +00:00
Craig Mautner
9851d03819 Stop logging service starts and stops. 
Completes work on bug 18201239.

Change-Id: I80686351ac91e48bf113976a000b351b423d8dd2
 2015-01-26 14:33:39 -08:00
Lorenzo Colitti
cd4c8525fa am 3d992507: am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev 
automerge: 583dec8

* commit '583dec84d95b69216b4f91dd31397dc5f32f4e95':
  Only try to fetch time from NTP if there is a network connection.
 2015-01-26 22:24:23 +00:00
Lorenzo Colitti
583dec84d9 am 3d992507: am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev 
* commit '3d992507a09b4d32c1e961a99d77027db050f01b':
  Only try to fetch time from NTP if there is a network connection.
 2015-01-26 22:22:27 +00:00
Lorenzo Colitti
3d992507a0 am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev 
* commit '09dff843b8ed402564c4c89d7e1cabceb715e458':
  Only try to fetch time from NTP if there is a network connection.
 2015-01-26 22:16:03 +00:00
Lorenzo Colitti
09dff843b8 Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev 2015-01-26 22:08:19 +00:00
Craig Mautner
1de57d883e resolve merge conflicts of 2322ea5 to master. 
Change-Id: I1570e633bf0d552a32d7fa9a2e0ebd81953f632b
 2015-01-26 13:45:12 -08:00
Craig Mautner
2322ea558e am 8995e140: Merge "Add reason string for bringing stack to front" into lmp-mr1-dev 
automerge: afc6d33

* commit 'afc6d332790166943302f051d32ec0874d9280aa':
  Add reason string for bringing stack to front
 2015-01-26 20:11:58 +00:00
Craig Mautner
afc6d33279 am 8995e140: Merge "Add reason string for bringing stack to front" into lmp-mr1-dev 
* commit '8995e140ad557c9f3f4667becbaaf0ba4c667638':
  Add reason string for bringing stack to front
 2015-01-26 20:09:48 +00:00
Craig Mautner
8995e140ad Merge "Add reason string for bringing stack to front" into lmp-mr1-dev 2015-01-26 20:05:45 +00:00
RoboErik
be2c3ee52c Merge "Persist safe MediaSession intents across reboots" 2015-01-26 19:05:47 +00:00
Craig Mautner
299f960e5e Add reason string for bringing stack to front 
Additional debug and useful information.
Also removed am_resume_activity verbosity and refactored method to
eliminate unused parameter.

For bug 17721767.

Change-Id: Ie1c0652a38a0c6ae6db27a52a9e5da29e252e300
 2015-01-26 10:57:11 -08:00
Benjamin Franz
8e1b6d949b am ad664808: am 6d16b861: Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev automerge: 2805669 
* commit 'ad66480838189332b82cd2861bca4357aa2b93da':
  Avoid NullPointerException if createUser returns null
 2015-01-26 11:04:41 +00:00
Benjamin Franz
ad66480838 am 6d16b861: Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev 
automerge: 2805669

* commit '2805669954b70b918d7b24f6695c4da85d6f88e8':
  Avoid NullPointerException if createUser returns null
 2015-01-26 10:59:45 +00:00
Benjamin Franz
2805669954 am 6d16b861: Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev 
* commit '6d16b8614ac4c5aa44304e6fdcb9ed8aeec675fd':
  Avoid NullPointerException if createUser returns null
 2015-01-26 10:55:14 +00:00
Zoltan Szatmary-Ban
43daa008f3 am 20bd0c23: am 059b8ab6: am 414ea81e: Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev 
* commit '20bd0c232cd4421affc871ccd01492ecd04316d0':
  Ensure notifications are sent when locking/unlocking location share
 2015-01-26 10:54:55 +00:00
Zoltan Szatmary-Ban
20bd0c232c am 059b8ab6: am 414ea81e: Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev 
* commit '059b8ab6a9444b1dbdfcdc1df50485dfac7adafa':
  Ensure notifications are sent when locking/unlocking location share
 2015-01-26 10:49:53 +00:00
Benjamin Franz
6d16b8614a Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev 2015-01-26 10:49:48 +00:00
Zoltan Szatmary-Ban
059b8ab6a9 am 414ea81e: Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev 
* commit '414ea81ea364d7b961cbfb885c30729595e3a7b2':
  Ensure notifications are sent when locking/unlocking location share
 2015-01-26 10:41:00 +00:00
Zoltan Szatmary-Ban
414ea81ea3 Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev 2015-01-26 10:36:14 +00:00
Lorenzo Colitti
351bfad339 Make NetworkMonitor less aggressive on broken networks. 
1. Retry validation 3 times instead of 10.

Reducing the number of retries speeds up dead network detection
and saves battery on networks that are don't have Internet access
(or block our connectivity checks).

Retrying 10 times is overkill. Each attempt sends 5-10 DNS
requests, waits 10 seconds to transfer only 3 or 4 packets, and
can last up to tens of seconds. Also, in MR1 we now retry every
10 minutes.

2. Make periodic revalidation only try once.

When validating periodically to see if a non-working connection
is working again, only make one attempt every 10 minutes, not
three.

3. Rename "retries" to "attempts" to make things a bit clearer.

Bug: 18922569
Bug: 18869302
Change-Id: I5f70b420c4f1bac0c33bb9ab6afb322902cdac4b
 2015-01-26 17:30:22 +09:00
Lorenzo Colitti
df59053588 Only try to fetch time from NTP if there is a network connection. 
Bug: 19046107
Change-Id: Iff647ee33fe0eb9b530d7baad636d32b386e4fa7
 2015-01-26 15:24:07 +09:00
Svetoslav
8a1d65b76a Accessibility: Sometimes cannot interact with nav bar items. automerge: 10a053e automerge: db1983b 
automerge: cd2ed4e

* commit 'cd2ed4e64c501a5dbf73941a4a1f1e4bc639ebf3':
  Accessibility: Sometimes cannot interact with nav bar items.
 2015-01-23 23:35:42 +00:00
Svetoslav
cd2ed4e64c Accessibility: Sometimes cannot interact with nav bar items. automerge: 10a053e 
automerge: db1983b

* commit 'db1983b3f43e86acbf188961f53af794cce05219':
  Accessibility: Sometimes cannot interact with nav bar items.
 2015-01-23 23:31:38 +00:00
Svetoslav
db1983b3f4 Accessibility: Sometimes cannot interact with nav bar items. 
automerge: 10a053e

* commit '10a053e474e2a566b49a1e4c9e2ec4c8cc0013bd':
  Accessibility: Sometimes cannot interact with nav bar items.
 2015-01-23 23:27:34 +00:00
Svetoslav
10a053e474 Accessibility: Sometimes cannot interact with nav bar items. 
If there is a window with the accessibility focus we want to click
on the accessibility focused view in this window. The logic to
compute the bounds of the window was using the wrong window id,
hence getting an incorrect result. As a consequence in some cases
the user could not click on accessiiblity focused controls in the
nav bar.

bug:18889611

Change-Id: I89aee3ae2ffe27fe29819049c287a7155154c65b
 2015-01-23 15:05:20 -08:00
Jinsuk Kim
b63524cc67 am 56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev automerge: ca1384d 
automerge: f612132

* commit 'f612132003d787a2b0e6af35d7a6e291d1cb186c':
  CEC: Handles initiation of press-and-hold correctly
 2015-01-23 21:24:47 +00:00
Jinsuk Kim
f612132003 am 56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev 
automerge: ca1384d

* commit 'ca1384dc5abb2d29906310fd577c5ed6fba25f24':
  CEC: Handles initiation of press-and-hold correctly
 2015-01-23 21:20:46 +00:00
Jinsuk Kim
ca1384dc5a am 56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev 
* commit '56c119abde951146951e3887796eb64ee05d25d3':
  CEC: Handles initiation of press-and-hold correctly
 2015-01-23 21:16:48 +00:00
Jinsuk Kim
56c119abde Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev 2015-01-23 21:10:38 +00:00
destradaa
13a60b0d41 Fix race condition generating READY and NOT_SUPPORTED statuses. 
The race condition only affects when the client registers for several (all) location listeners.
And the side efects are benign: only the measurement and navigation message status are incurrectly
being sent to the application, but there are no crashes or any real data from GPS being
misscommunicated.
Also:
- cache the last reported status to filter sending notifications when no changes have occurred
- do some cleanup and refactoring in the code changed

Change-Id: I0692e6b70847dc1ee092d7a05a2c6ba3cd9fa147
 2015-01-23 10:26:17 -08:00
Benjamin Franz
f87b174dac Avoid NullPointerException if createUser returns null 
If createUser returns null, we run into a NullPointerException
in createAndInitializeUser. This can happen when the policy
DISALLOW_ADD_USER is set.

Bug: 19121141
Change-Id: Id4bda832a243fa42c31eb5a176ecaa248aee68f5
 2015-01-23 17:04:16 +00:00
Benjamin Franz
cd7b506c19 am bfca5f40: am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 
automerge: 07b87e5

* commit '07b87e537da3ec658235fe1d874c7dba5b4d696d':
  Avoid SecurityException when calling getUserData
 2015-01-23 14:46:31 +00:00
Benjamin Franz
07b87e537d am bfca5f40: am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 
* commit 'bfca5f40eb9e5d888218c615fa744e5d8ea2d207':
  Avoid SecurityException when calling getUserData
 2015-01-23 14:42:38 +00:00