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

24769 Commits

Author SHA1 Message Date
Craig Mautner
83f367475b Merge "Revert "Revert "Do not display ADB confirm dialog during boot""" 2015-02-06 00:01:45 +00:00
Craig Mautner
b43d3cff67 Revert "Revert "Do not display ADB confirm dialog during boot"" 
This reverts commit e37099ffdfc966d52b4323a3705359ea42fa283e.

Fixes bug 18652251

Change-Id: Ib00e8269558aae294ff6453d1f6ceef1771c4572
 2015-02-06 00:01:28 +00:00
Craig Mautner
968aca1d7e Merge "Revert "Do not display ADB confirm dialog during boot"" 2015-02-06 00:00:30 +00:00
Craig Mautner
e37099ffdf Revert "Do not display ADB confirm dialog during boot" 
This reverts commit 34e90b2214b39db31bccaf24644d0db55bcde965.

Change-Id: Ib385793aa2b7472933bdb0c707b10e2bac1a4cb3
 2015-02-06 00:00:17 +00:00
Craig Mautner
b8415ecfe9 Merge "Do not display ADB confirm dialog during boot" 2015-02-05 23:58:16 +00:00
Dianne Hackborn
02cc7e2204 am 4fdac613: am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev automerge: 29039a2 
* commit '4fdac61388bd25a4a5bf6caef5bee0360e48ab51':
  Always re-establish kernel alarms when considering new alarm set
 2015-02-05 23:07:46 +00:00
Dianne Hackborn
4fdac61388 am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev 
automerge: 29039a2

* commit '29039a2bdbadcc427a966f5e7a6021fd424c4266':
  Always re-establish kernel alarms when considering new alarm set
 2015-02-05 23:04:21 +00:00
Craig Mautner
81451d3bf2 Merge "Code cleanup." 2015-02-05 22:26:29 +00:00
Kenny Guy
3775a3f886 am a2ced3e8: am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev automerge: eeb43fb 
* commit 'a2ced3e879458786edf715a0016293791db7fd65':
  Only switch user if current user is being wiped
 2015-02-05 19:39:36 +00:00
Dianne Hackborn
29039a2bdb am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev 
* commit '5c2fdc331f81b671d426f3f5a7e59cd9cbed80bf':
  Always re-establish kernel alarms when considering new alarm set
 2015-02-05 19:39:23 +00:00
Dianne Hackborn
5c2fdc331f Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev 2015-02-05 19:26:32 +00:00
Kenny Guy
a2ced3e879 am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev 
automerge: eeb43fb

* commit 'eeb43fbd61adfc6511528e2e13fd5372a14e2831':
  Only switch user if current user is being wiped
 2015-02-05 18:51:53 +00:00
Paul McLean
26bf3ea56e Merge "Add additional info to AudioPort for enum/selection API." 2015-02-05 18:26:56 +00:00
Wale Ogunwale
6aa20770ac Merge "Make sure window frame fits in the containing frame." 2015-02-05 18:14:48 +00:00
Wale Ogunwale
0e1621850b Fixed NPE when trying to resize stack with no running activity. 
Change-Id: If5b6a1110aa8a615def97c9707364e0cc12f4b39
 2015-02-05 08:48:34 -08:00
Kenny Guy
eeb43fbd61 am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev 
* commit '8d12d3da15a92fde05256c51f8a3085ab9399c0f':
  Only switch user if current user is being wiped
 2015-02-05 15:26:09 +00:00
Wale Ogunwale
30cc7bf612 Make sure window frame fits in the containing frame. 
Bug: 19225079
Change-Id: I6af20cff685dd83f7cc7685a6d987334e023ee8b
 2015-02-04 16:47:57 -08:00
Craig Mautner
e7cfceb58d Code cleanup. 
Change-Id: Ie12fea5db28633a95fec440eb7a8c5a5a8c45a1b
 2015-02-04 15:57:06 -08:00
Paul McLean
10804eb281 Add additional info to AudioPort for enum/selection API. 
Add "device name" member to AudioPort.
Moved unique device ID from DevicePort to AudioPort.
Straighten out confusion between "name" and "address"
Created string constants for Intent "extra" data keys.
Combine card/address data into "address" at sender.Add additional info to AudioPort for enum/selection API.
Parse out USB Device name in UsbCardsParser.

Change-Id: Ifd76b0298312090a8f39e638339f993b86d47080
 2015-02-04 14:37:19 -08:00
Christopher Tate
c83d3e4b72 Always re-establish kernel alarms when considering new alarm set 
As a backstop against missed alarm delivery / wakeups or clock slew,
make sure to always schedule a kernel alarm for the next alarm events
of interest when we've reexamined the set of deliverable alarms.

Bug 19201933

Change-Id: I3cd37a63dfb0c8258941497d4ba516ed00e2edad
 2015-02-04 13:48:29 -08:00
Kenny Guy
e9acb59a91 Only switch user if current user is being wiped 
Only try and switch to owner if the current user
is being removed.

Bug: 19252449
Change-Id: I0143d87360db0834876821cbf52fec4933ecbd35
 2015-02-04 17:55:42 +00:00
Craig Mautner
34e90b2214 Do not display ADB confirm dialog during boot 
Wait until after encrypted volume has been mounted.
Also eliminate warning by starting UsbDebuggingActivity as owner.

Fixes bug 19217173.

Change-Id: I6da530259bb02eb1892509ec5085a471f9893714
 2015-02-04 09:41:40 -08:00
Wale Ogunwale
1cfec7c3de Merge "Fixed issue with resized stack sticking to the top of the screen." 2015-02-04 00:29:21 +00:00
Wale Ogunwale
dd11d4d6d3 Fixed issue with resized stack sticking to the top of the screen. 
WindowState.mUnderStatusBar wasn't set correctly when the stack was
resized before the window was added to it. Changed to use
TaskStack.mUnderStatusBar instead which will always have the
correct answer.

Bug: 19204013
Change-Id: Ib4660302c6a2aebd47bff354c1efab93a1e1a255
 2015-02-03 16:09:02 -08:00
Paul Jensen
a3a8b3131c am f1b78d04: Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev automerge: 39ae054 
automerge: b35275a

* commit 'b35275a25e1a0775458fcbda5b6e8180a0e3311a':
  Facilitate network validation on networks with a per-network PAC.
 2015-02-03 21:22:00 +00:00
Paul Jensen
b35275a25e am f1b78d04: Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev automerge: 39ae054 
* commit 'f1b78d046965f91c2e03d541cba4c91ea707111a':
  Facilitate network validation on networks with a per-network PAC.
 2015-02-03 21:17:09 +00:00
Paul Jensen
f1b78d0469 Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev 
automerge: 39ae054

* commit '39ae0547ca5a1e7cfe24a945b2f8a910e09b7f3c':
  Facilitate network validation on networks with a per-network PAC.
 2015-02-03 21:11:51 +00:00
Paul Jensen
39ae0547ca Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev 2015-02-03 21:08:59 +00:00
Ruben Brunk
35fa2bc2e4 Merge "Add ProcessInfoService to activity manager." 2015-02-03 20:23:04 +00:00
Craig Mautner
42da895b90 Merge "[ActivityManager] Prevent application holding AMS lock" automerge: 53e8d6f automerge: 6112f63 
automerge: e8bd6d7

* commit 'e8bd6d734ccef685c4e25a0ec1735c140b9fe644':
  [ActivityManager] Prevent application holding AMS lock
 2015-02-03 18:52:59 +00:00
Craig Mautner
e8bd6d734c Merge "[ActivityManager] Prevent application holding AMS lock" automerge: 53e8d6f 
automerge: 6112f63

* commit '6112f63369c7ba463c0384c73a4e4c0d45b63918':
  [ActivityManager] Prevent application holding AMS lock
 2015-02-03 18:48:29 +00:00
Craig Mautner
53e8d6f934 Merge "[ActivityManager] Prevent application holding AMS lock" 2015-02-03 18:41:14 +00:00
Craig Mautner
b95a8abcaf am c0e9c1d0: am 240e8743: Merge "[ActivityManager] Set appropriate relation of task to home" automerge: 7d1aded 
* commit 'c0e9c1d0a405c66e7ec75eb6268f84fe1d466344':
  [ActivityManager] Set appropriate relation of task to home
 2015-02-03 18:09:38 +00:00
Craig Mautner
c0e9c1d0a4 am 240e8743: Merge "[ActivityManager] Set appropriate relation of task to home" 
automerge: 7d1aded

* commit '7d1adede2fbea8f4c0ad92214bee16395498dd07':
  [ActivityManager] Set appropriate relation of task to home
 2015-02-03 18:04:32 +00:00
Craig Mautner
240e874397 Merge "[ActivityManager] Set appropriate relation of task to home" 2015-02-03 17:54:27 +00:00
Tony Mantler
338026f59a Merge "Check NAVIGATION_NONAV in ActivityManagerService" 2015-02-03 17:50:17 +00:00
Wale Ogunwale
f5db946ffa Merge "Support for activity to opt-in/out of resizeable/multi-window support." 2015-02-03 17:16:16 +00:00
Paul Jensen
8fe1742946 Facilitate network validation on networks with a per-network PAC. 
On networks with a per-network PAC, Network.openConnection(URL) will
fetch using NO_PROXY.  This will fail on networks where Internet
access is only permitted via the proxy.  Always failing network
validation has the potential to disable WiFi auto-join.  Instead
of performing the normal connectivity check, instead attempt to
fetch the PAC, as this is meant to succeed with NO_PROXY.

bug:19143573
Change-Id: Ia482f5c046d338c27daf42571f20851dfa36671c
 2015-02-03 11:28:55 -05:00
Svetoslav
7e760ee59d Fix broken activation of the selected view in accessibility mode. automerge: ded133c automerge: b6b526e 
automerge: f8acd7a

* commit 'f8acd7a961f3a36712519d0f925f86f3da8d0b7c':
  Fix broken activation of the selected view in accessibility mode.
 2015-02-03 07:31:28 +00:00
Svetoslav
f8acd7a961 Fix broken activation of the selected view in accessibility mode. automerge: ded133c 
automerge: b6b526e

* commit 'b6b526eaafdcc39e9d55a82f61f1e03c4a3487c3':
  Fix broken activation of the selected view in accessibility mode.
 2015-02-03 07:27:33 +00:00
Svetoslav
b6b526eaaf Fix broken activation of the selected view in accessibility mode. 
automerge: ded133c

* commit 'ded133c446fa9d0d23e6bde19a66fb2ce3980491':
  Fix broken activation of the selected view in accessibility mode.
 2015-02-03 07:20:34 +00:00
Wale Ogunwale
9d3de4cfb4 Support for activity to opt-in/out of resizeable/multi-window support. 
Bug: 19178148
Change-Id: I5819a71cdc48e0af4add11a6d4a503ec5cbe5d63
 2015-02-02 16:06:55 -08:00
RoboErik
7b3da2d415 Fix crash in dumpsys media_session 
Changes the dump to use the correct keys instead of just counting
when doing a dump of users.

Change-Id: Ibb2033f1cc9209fff03e5cf4928acacca29fc11b
 2015-02-02 15:23:59 -08:00
Svetoslav
ded133c446 Fix broken activation of the selected view in accessibility mode. 
We were using an approximation to determine where to send a pair of down
and up events to click on the view that has accessibility focus. We were
doing reverse computation to figuring out which portion of the view is
not covered by interactive views and get a point in this region. However,
determining whether a view is interactive is not feasible in general since
for example may override onTouchEvent. This results in views not being
activated or which is worse wrong views being activated.

This change swithes to a new approach to activate views in accessibility
mode which is guaranteed to always work except the very rare case of a
view that overrides dispatchTouchEvent (which developers shouldn't be
doing). The new approach is to flag the down and up events pair sent
by the touch explorer as targeting the accessibility focused view. Such
events are dispatched such that views predecessors of the accessibility
focus do not handle them guaranteeing that these events reach the accessibiliy
focused view. Once the accessibiliy focused view gets such an event it clears
the flag and the event is dispatched following the normal event dispatch
semantics.

The new approach is semantically equivalent to requesting the view to perform
a click accessiblitiy action but is more generic as it is not affected by
views not implementing click action support correctly.

bug:18986806
bug:18889611

Change-Id: Id4b7b886c9fd34f7eb11e606636d8e3bab122869
 2015-02-02 23:17:17 +00:00
Tony Mantler
843ce5b2a2 Check NAVIGATION_NONAV in ActivityManagerService 
b/18733457

Change-Id: I12b4d1da3564129a445882025575d759fc80d6d2
 2015-02-02 14:27:44 -08:00
destradaa
22287fe7c2 Merge "Fix race condition generating READY and NOT_SUPPORTED statuses." 2015-02-02 18:07:41 +00:00
Ruben Brunk
a27eef432a Add ProcessInfoService to activity manager. 
- Adds a new AIDL interface for querying process
  information from activity manager.

Bug: 19186859
Change-Id: Ic08858f346d6b66e7bfc9da6faa2c6e38d9b2e82
 2015-01-30 16:58:14 -08:00
Jinsuk Kim
266fd264db am 42e785fb: am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev 
automerge: 7bc0929

* commit '7bc0929905fa5964a6f9a5b0b059153dc8cdd69d':
  Revert "CEC: Let playback device switch TV input after bootup"
 2015-01-30 22:16:46 +00:00
Jinsuk Kim
7bc0929905 am 42e785fb: am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev 
* commit '42e785fbf7dfa50096275cf1e6233247e9fc15f7':
  Revert "CEC: Let playback device switch TV input after bootup"
 2015-01-30 22:15:00 +00:00
Jinsuk Kim
42e785fbf7 am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev 
* commit '3457ae4709c8444f8ff9cdaf5809d6164f3bd21a':
  Revert "CEC: Let playback device switch TV input after bootup"
 2015-01-30 22:06:09 +00:00