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

278483 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wyatt Riley
549c81c270 Merge "LocationManager - Handle Shutdown for right User" into nyc-mr1-dev 2016-08-05 15:17:22 +00:00
Todd Kennedy
31b95e0265 Move EphemeralResolverService 
It should not have been under com.android.internal

Fixes: 30673742
Change-Id: I2277aa4a4799fa59bf68af7c4cfcb4e1216aeb8d
 2016-08-05 07:17:52 -07:00
Jason Monk
c896963063 QS: Fix accidental a11y tile removal 
Change-Id: I5b5c3bac0b92a7cc5585dcd55571fa055da0e5eb
Fixes: 30443933
 2016-08-05 10:08:11 -04:00
Tobias Thierer
e6851b5a66 Merge "APIs for ProcessBuilder.Redirect" am: e49469aed1 am: c548ff23bd am: 22aa35d510 
am: bd919aaca9

Change-Id: I60b967da62019356512e62d13ecb54d9f511ea33
 2016-08-05 13:06:10 +00:00
Tobias Thierer
bd919aaca9 Merge "APIs for ProcessBuilder.Redirect" am: e49469aed1 am: c548ff23bd 
am: 22aa35d510

Change-Id: I99c0b399f523d4c04b3009e89414fe4fda716c81
 2016-08-05 13:01:03 +00:00
Tobias Thierer
e5bce1a255 Update api/test-current.txt for ProcessBuilder API am: 6af44aeea0 am: 95b759e178 
am: 6cdfba9d58

Change-Id: I43b92d531f71fad2933f85321130af0c4ef0cdd4
 2016-08-05 12:55:24 +00:00
Tobias Thierer
22aa35d510 Merge "APIs for ProcessBuilder.Redirect" am: e49469aed1 
am: c548ff23bd

Change-Id: I97d741f344ee59e8f493f0ac8d0b41a63adc9c14
 2016-08-05 12:51:50 +00:00
Tobias Thierer
6cdfba9d58 Update api/test-current.txt for ProcessBuilder API am: 6af44aeea0 
am: 95b759e178

Change-Id: I7a9ef8a5857cd8950f846dcb533041b9e08f6603
 2016-08-05 12:50:33 +00:00
Tobias Thierer
c548ff23bd Merge "APIs for ProcessBuilder.Redirect" 
am: e49469aed1

Change-Id: I6c479a84044cfd8df084a3c9707f7aaaf09546fa
 2016-08-05 12:44:48 +00:00
Tobias Thierer
95b759e178 Update api/test-current.txt for ProcessBuilder API 
am: 6af44aeea0

Change-Id: I0009f3d758af696aca14851f53459c6a332beb47
 2016-08-05 12:44:35 +00:00
Tobias Thierer
6af44aeea0 Update api/test-current.txt for ProcessBuilder API 
Test: make update-api docs

Bug: 27464570
Change-Id: Iee1fec0efb241ba091494467ab3632675c1d07d4
 2016-08-05 12:37:21 +00:00
Tobias Thierer
e49469aed1 Merge "APIs for ProcessBuilder.Redirect" 2016-08-05 12:36:35 +00:00
Jorim Jaggi
01f0044983 Merge "Call userActivity when dismissing keyguard" into nyc-mr1-dev am: b11cc6cbd3 am: 53b4a2d6cb 
am: 10dcc0eb99

Change-Id: Ib7a198e0c1ad0ecc3090799933d9cae3eb84b42a
 2016-08-05 12:13:44 +00:00
Jorim Jaggi
356955e9e5 Call userActivity when dismissing keyguard am: b9d0491559 am: f564799b49 
am: 501b0cbedd

Change-Id: I254c082fa58b28ea355599d79f71129363f53a38
 2016-08-05 12:13:37 +00:00
Jorim Jaggi
5940afdb5e Merge "Fix flickering issues with FLAG_SHOW_WHEN_LOCKED and fingerprint wake" into nyc-mr1-dev am: 4d140b72f2 am: 076d79aa40 
am: fc2a42ebd6

Change-Id: I93e063134e6226adc343368fc31be1f9848d2aff
 2016-08-05 12:13:28 +00:00
Jorim Jaggi
0659029fd2 Fix flickering issues with FLAG_SHOW_WHEN_LOCKED and fingerprint wake am: e93e6f9deb am: f6929c4750 
am: 864de6a179

Change-Id: Ide3b6febc8a2daf751a94a9ae8ae0d2bcfddf51f
 2016-08-05 12:13:21 +00:00
Jorim Jaggi
10dcc0eb99 Merge "Call userActivity when dismissing keyguard" into nyc-mr1-dev am: b11cc6cbd3 
am: 53b4a2d6cb

Change-Id: Id2fd652b14fc80db72157586d3f7cd776001d28b
 2016-08-05 12:06:48 +00:00
Jorim Jaggi
501b0cbedd Call userActivity when dismissing keyguard am: b9d0491559 
am: f564799b49

Change-Id: Ia5f935cc15bd8a65661fc12ef1ce23226bd9939c
 2016-08-05 12:06:45 +00:00
Jorim Jaggi
fc2a42ebd6 Merge "Fix flickering issues with FLAG_SHOW_WHEN_LOCKED and fingerprint wake" into nyc-mr1-dev am: 4d140b72f2 
am: 076d79aa40

Change-Id: I4485756fb05c5c173cac6b9312ad8cc988f5db54
 2016-08-05 12:06:41 +00:00
Jorim Jaggi
864de6a179 Fix flickering issues with FLAG_SHOW_WHEN_LOCKED and fingerprint wake am: e93e6f9deb 
am: f6929c4750

Change-Id: I278c94ff9b1e146aaeba3eb7c77c1b29008a6a9d
 2016-08-05 12:06:37 +00:00
Jorim Jaggi
53b4a2d6cb Merge "Call userActivity when dismissing keyguard" into nyc-mr1-dev 
am: b11cc6cbd3

Change-Id: I0e7c8ea28b05bc4f5eaf5ba3234367372091b89c
 2016-08-05 12:00:15 +00:00
Jorim Jaggi
f564799b49 Call userActivity when dismissing keyguard 
am: b9d0491559

Change-Id: I4b688fae491a5bd7fb531eaf63d4f952657409cf
 2016-08-05 12:00:12 +00:00
Jorim Jaggi
076d79aa40 Merge "Fix flickering issues with FLAG_SHOW_WHEN_LOCKED and fingerprint wake" into nyc-mr1-dev 
am: 4d140b72f2

Change-Id: I94444be4b8ac554735fdcb4cc8f46e5e1d1113c3
 2016-08-05 12:00:09 +00:00
Jorim Jaggi
f6929c4750 Fix flickering issues with FLAG_SHOW_WHEN_LOCKED and fingerprint wake 
am: e93e6f9deb

Change-Id: Ic0539df986116c619f0912d72b8e145a8275947e
 2016-08-05 12:00:07 +00:00
TreeHugger Robot
b11cc6cbd3 Merge "Call userActivity when dismissing keyguard" into nyc-mr1-dev 2016-08-05 11:53:59 +00:00
TreeHugger Robot
4d140b72f2 Merge "Fix flickering issues with FLAG_SHOW_WHEN_LOCKED and fingerprint wake" into nyc-mr1-dev 2016-08-05 11:53:38 +00:00
Przemyslaw Szczepaniak
dd41956625 Merge "Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82" into stage-aosp-master am: e2e65a4708 am: 96194e10a6 
am: 073012d96d

Change-Id: I65186579268b6fbe37cba44d38fe2406b6d8d627
 2016-08-05 10:43:16 +00:00
Przemyslaw Szczepaniak
4f837cd7a7 Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82 am: 49929ccf46 am: 7116e5d2d3 
am: 7ec0ba1ed3

Change-Id: If22e617f947a122d457ce073711cd73f51e000df
 2016-08-05 10:43:09 +00:00
Przemyslaw Szczepaniak
073012d96d Merge "Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82" into stage-aosp-master am: e2e65a4708 
am: 96194e10a6

Change-Id: I2d1e3c7c1c5c6b87efb32be7e19ebf67113fcfad
 2016-08-05 10:37:39 +00:00
Przemyslaw Szczepaniak
7ec0ba1ed3 Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82 am: 49929ccf46 
am: 7116e5d2d3

Change-Id: I9a8f68a6ce20de1a8a43e829c04c063d08b1b85e
 2016-08-05 10:37:36 +00:00
Przemyslaw Szczepaniak
96194e10a6 Merge "Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82" into stage-aosp-master 
am: e2e65a4708

Change-Id: If3fe3c4e5d242dc768789b093ddef2bbc08f4c78
 2016-08-05 10:32:44 +00:00
Przemyslaw Szczepaniak
7116e5d2d3 Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82 
am: 49929ccf46

Change-Id: Ie9d2d41124395588fa58dc0f97447a9e77094609
 2016-08-05 10:32:39 +00:00
Przemyslaw Szczepaniak
e2e65a4708 Merge "Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82" into stage-aosp-master 2016-08-05 10:25:24 +00:00
Przemyslaw Szczepaniak
5bd4be6e7d Merge "Track libcore change 0e393b4d628541e84e31210342f4103315c07e23" am: 50f3429d14 am: 622e170338 am: c57b96bf11 
am: c3bc13cd26

Change-Id: I0ba08743a5021d02d9e111a1271af2f63c576ee9
 2016-08-05 10:05:10 +00:00
Przemyslaw Szczepaniak
c3bc13cd26 Merge "Track libcore change 0e393b4d628541e84e31210342f4103315c07e23" am: 50f3429d14 am: 622e170338 
am: c57b96bf11

Change-Id: I0d5c8158210e17161cf9f9310f5f94457f79a8e2
 2016-08-05 09:58:49 +00:00
Przemyslaw Szczepaniak
c57b96bf11 Merge "Track libcore change 0e393b4d628541e84e31210342f4103315c07e23" am: 50f3429d14 
am: 622e170338

Change-Id: Ia1fde043f68030d5676c39f9eda632061ef09eab
 2016-08-05 09:51:59 +00:00
Przemyslaw Szczepaniak
622e170338 Merge "Track libcore change 0e393b4d628541e84e31210342f4103315c07e23" 
am: 50f3429d14

Change-Id: I2fdd89afd9cfc0cc36be2664dee559e7b0977c6d
 2016-08-05 09:44:55 +00:00
Przemyslaw Szczepaniak
50f3429d14 Merge "Track libcore change 0e393b4d628541e84e31210342f4103315c07e23" 2016-08-05 09:36:41 +00:00
Przemyslaw Szczepaniak
49929ccf46 Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82 
Version with test-current.txt

Bug: 28666126
Change-Id: I3677508ff00c381c88fe9c767ec7037493b574f8
 2016-08-05 09:33:51 +00:00
Hans Boehm
a2c487ae73 resolve merge conflicts of c73e080 to nyc-dev-plus-aosp am: 47a6b76511 
am: b69bc5bbf7

Change-Id: Ifc4eebcdca44395943339265748617edeec6cb58
 2016-08-05 03:22:35 +00:00
Hans Boehm
b69bc5bbf7 resolve merge conflicts of c73e080 to nyc-dev-plus-aosp 
am: 47a6b76511

Change-Id: Icfddef5a5b499df48fb3b1e5362503cc1ae6e01f
 2016-08-05 03:15:49 +00:00
Hans Boehm
47a6b76511 resolve merge conflicts of c73e080 to nyc-dev-plus-aosp 
Change-Id: I9629e28bff28a67a6584c5e67a01ef25428a2194
 2016-08-04 20:04:08 -07:00
Hans Boehm
c73e080eea Merge "Update SMP documentation." 
am: 497ac5eccb

Change-Id: I06d06e205a8bf7646500fa6c8d86eb7cfa49e6ce
 2016-08-05 02:05:57 +00:00
Hans Boehm
497ac5eccb Merge "Update SMP documentation." 2016-08-05 01:59:38 +00:00
Doris Liu
f7167e8f28 Support repeatMode = reverse in AVD 
BUG: 30641232
Change-Id: I34c823a0a45c8441873a9b467275174c5529994b
 2016-08-05 01:44:20 +00:00
Wale Ogunwale
6603f4fead Removed unneeded search for root token in WindowState ctor. 
The search will always return the WindowToken used to give the key to
the map since there is a one-to-one key-value mapping of IBinder token
to WindowToken that is enforced in WindowToken ctor.

Bug: 30060889
Change-Id: I732ec7da5872ed22c7832690ea6a2cebc9b492f8
 2016-08-04 18:30:52 -07:00
Wale Ogunwale
9f25beee3a Made AppWindowToken.allAppWindows private 
Pre-clean-up before switching class to using WindowContainer.

Bug: 30060889
Change-Id: Ic3d47d47b922668eeb70988ce883267b46ca9d72
 2016-08-04 18:30:52 -07:00
Wale Ogunwale
0b5adb38a7 Add new WindowToken to WMS.mTokenMap when constructed 
Adding it to the map in the ctor makes it easier to follow what is
going on and reduces the chance of errors in the future.

Bug: 30060889
Change-Id: I7e56bc51be1067c6f4ad47188679d2fbabb04921
 2016-08-04 18:30:52 -07:00
Wale Ogunwale
2049dbf0e9 Replaced use of WT.appWindowToken with WT.asAppWindowToken 
Not a perfect implementation, but slightly less confusing as
the child class is no longer a member variable of the parent
class.

Also renamed WindowToken.service to WindowToken.mService to be
consistent with how we name in other places.

Bug: 30060889
Change-Id: Ib21472a784a4f24e7789d443876cf0912d9e89de
 2016-08-04 18:30:52 -07:00
Christine Hallstrom
89142e9cc9 Merge "DO NOT MERGE ANYWHERE: Deprecate QNS network disable reason BAD_LINK" into cw-f-dev am: edaac2316e -s ours 
am: 8f8db9c82c  -s ours

Change-Id: Ie1cfe59933082ba7b505b8d393160374c35700b5
 2016-08-05 01:16:08 +00:00