summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add additional density enums to android:screenDensity attributeAdam Lesinski2015-10-122-7/+13
| | | | | Bug:24804021 Change-Id: I70c34da9ca5d186aa1ffaacf7f15180d4c4b81e1
* Use effectiveUid instead of callingUid to set lockTaskModeWale Ogunwale2015-10-121-1/+1
| | | | | | | | | The callingUid can be different from that of the app been locked (e.g. was launched from launcher) there by leading to the app crashing when it tries to exit lockTaskMode. Bug: 24146132 Change-Id: I03346fabd1d7e61b29178220c72f747a0600f5ec
* Merge "[RenderScript] pass correct length of ains to BLAS functions" into ↵Miao Wang2015-10-121-4/+4
|\ | | | | | | mnc-dr-dev
| * [RenderScript] pass correct length of ains to BLAS functionsMiao Wang2015-10-091-4/+4
| | | | | | | | | | | | bug: 24540091 Change-Id: Ia541bcbee07125c4caf3e0f4863702a3c0b929d5 (cherry picked from commit 0b34f2a3c545cb112a23072c92214e359a8df8c6)
* | Merge "Fix parole scheduling bugs." into mnc-dr-devJeff Sharkey2015-10-121-3/+2
|\ \
| * | Fix parole scheduling bugs.Jeff Sharkey2015-09-141-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a few subtle bugs in app idle parole scheduling that would cause us to never end a parole period we had entered. The updated logic in this change concentrates the registration for the next event in one place in setAppIdleParoled(). Bug: 24050462 Change-Id: I1efe43cd6e00a547f70c4a4a37e1f3ef52a7e706
* | | Merge "Push firewall rules up to ConnectivityService." into mnc-dr-devJeff Sharkey2015-10-123-66/+72
|\ \ \ | |/ /
| * | Push firewall rules up to ConnectivityService.Jeff Sharkey2015-09-143-66/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getActiveNetworkInfo() and friends already know how to augment their results to help apps detect when network access is blocked. This change wires up the new app-idle and device-idle firewall rules to be reported through these APIs. This also causes other platform tools like DownloadManager and SyncManager to respect these new policies. Bug: 24050462 Change-Id: Id9517b0b70be7e3ca2ab27bed8049db916e4d829
* | | Merge "Default location is "internalOnly" when undefined." into mnc-dr-devJeff Sharkey2015-10-121-1/+2
|\ \ \
| * | | Default location is "internalOnly" when undefined.Jeff Sharkey2015-10-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an app doesn't define installLocation, the default behavior should be to treat it as internal only. This matches all the published developer documentation. Without this, apps could be unwittingly be moved to adopted storage devices. Bug: 24771264 Change-Id: Iaf38ab45329aad6cb5d6deac81fb1781f680189b
* | | | wm: call displayReady for all built in displays when system is ready.Vinu Deokaran2015-10-121-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When system has more than one built in display, displayReady needs to be called for all built in displays when window manager is ready. Otherwise, some system services, such as presentation, mediarouter, etc, won't work on these displays. Bug: 24103683 Change-Id: Ibf08074eff555c14a318236bd06e7b4855503140
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-122-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I24c1dbc83857fa0af6a57d0a834fcda1394fd313 Auto-generated-cl: translation import
* | | | Connect the DHCP UDP socket to the server.Lorenzo Colitti2015-10-112-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it so that the socket cannot receive datagrams from anybody except the DHCP server. This does not improve security, because we never read from the UDP socket anyway, but it does make ListeningPortsTest pass. Bug: 23906864 Bug: 23933386 Change-Id: Ib090273a417f7eb2ac1ee3309260249b72fb8345
* | | | Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-devLorenzo Colitti2015-10-115-48/+164
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Support DHCP replies with multiple default gateways. Accept DHCP responses from non-67 server source ports Improve logging of DHCP parse errors using exceptions.
| * | | | Support DHCP replies with multiple default gateways.Lorenzo Colitti2015-10-084-15/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just use the first one for compatibility with the legacy client. Bug: 23975855 Change-Id: Id6a0b0de32e8947c12c02eb9a3be417e2f82c99a
| * | | | Accept DHCP responses from non-67 server source portsErik Kline2015-10-082-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24687559 Change-Id: I5f03b8b2780c558281d8a50d0893fd64f2812add
| * | | | Improve logging of DHCP parse errors using exceptions.Erik Kline2015-10-083-34/+63
| |/ / / | | | | | | | | | | | | | | | | Bug: 23975855 Change-Id: I62464b92f0bb568e57bf5e1a63bc75f22c75aac1
* | | | Merge "Fix issue #24743380: VoiceInteractionManagerService doesn't use ↵Dianne Hackborn2015-10-102-4/+14
|\ \ \ \ | |_|_|/ |/| | | | | | | current..." into mnc-dr-dev
| * | | Fix issue #24743380: VoiceInteractionManagerService doesn't use current...Dianne Hackborn2015-10-092-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...user for service info Now it does. The actual change is basically one line, passing in the current user when building the service info. The rest is more debugging output to be able to see what is going on. Change-Id: I451884e0780aac6ee92fd2cd520071894afdf586
* | | | Safely handle interrupts during Thread.join()Pirama Arumuga Nainar2015-10-081-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24342101 Interrupt current thread if InterruptedException is received during Thread.join(). Also, log the interruption. Change-Id: I452124915ea3f19610e6d4a3411d741f2f604af2 (cherry picked from commit 83461d73bc50d41f631e1db5c195d12b4eb9e6cf)
* | | | Retry if interrupted before mMessageThread has joinedPirama Arumuga Nainar2015-10-081-3/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24342101 If interrupted during mMessageThread.join(), retry the join instead of assuming the thread has joined and continuing. Continuing to destroy the context will cause a segfault when the message thread attempts to use the destroyed context. Change-Id: I3213091a0e996449bceb403dffca3063786d5a65 (cherry picked from commit 2f25ce7753f7f1f6a0cc549a0df0082286bd5f85)
* | | Merge "Actually apply after no sims change." into mnc-dr-devJason Monk2015-10-081-0/+1
|\ \ \
| * | | Actually apply after no sims change.Jason Monk2015-10-081-0/+1
| | | | | | | | | | | | | | | | | | | | Bug: 24244260 Change-Id: I922d45e6dcc4eb85fc7d93824e7d01645a90266e
* | | | Merge "Hold wake-lock during copy operations." into mnc-dr-devJeff Sharkey2015-10-082-1/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Hold wake-lock during copy operations.Jeff Sharkey2015-10-022-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the CPU goes to sleep during the copy, certain devices will collapse the USB OTG power domain, which can cause user data loss. Bug: 24574575 Change-Id: I8e26caac8784490d2dee324b38e6085cd55eb8bb
* | | | Merge "Add ESC mapping for Pixel C keyboard" into mnc-dr-devPuneet Kumar2015-10-081-0/+1
|\ \ \ \
| * | | | Add ESC mapping for Pixel C keyboardDmitry Torokhov2015-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we have "replace" key event support in the framework we can map ESC as AltR+1. Bug: 24504154 Change-Id: Ief8a50098fc5484171011f268ffc22a309cbba62
* | | | | Merge "Add layout and keymap for Pixel C Bluetooth keyboard" into mnc-dr-devPuneet Kumar2015-10-082-0/+404
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Add layout and keymap for Pixel C Bluetooth keyboardDmitry Torokhov2015-09-292-0/+404
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds special layout and character map for Pixel C keyboard (Dragon base) that lacks several keys, such as ESC, bracket keys, tilda and backslash, which are mapped various Alt-R combinations. Currently we map: [Shift]+AltR+2 -> ~ and ` [Shift]+AltR+O -> { and [ [Shift]+AltR+P -> } and ] [Shift]+AltR+= -> | and \ ESC mapping requires additional changes. Bug: 24504154 Change-Id: I24fc68efe7e2ddebee26a273838443b441491857
* | | | Merge "Ensure SurfaceView requests WM relayout when size changes." into ↵Tim Murray2015-10-071-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | mnc-dr-dev
| * | | | Ensure SurfaceView requests WM relayout when size changes.Robert Carr2015-10-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of scaled SurfaceViews with a fixed size. It is possible for the surface layout size to change without a change to the surface size or position. In this case we need to inform the window manager so it can update frames and scaling. This has presented in Camera and required workarounds such as changing the fixed surface size to trigger an update (leading to visual artifacts). Bug:23974105 Change-Id: I195aa0832907c32874b294101b56e198e853dce5 (cherry picked from commit a8fe43f09c0ed2119e55139a482f7f12fbe7d725)
* | | | | Merge "MediaActionSound: Fix video stop sound" into mnc-dr-devChien-Yu Chen2015-10-071-1/+1
|\ \ \ \ \
| * | | | | MediaActionSound: Fix video stop soundChien-Yu Chen2015-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24745252 Change-Id: I803679d52750e09c7fc7b881523becf9259b558b
* | | | | | am a636be6c: Camera: fix wrong FULL feature stringYin-Chia Yeh2015-10-071-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | * commit 'a636be6c9a8a9192f72a111c2b3084a226d37b7e': Camera: fix wrong FULL feature string
| * | | | | Camera: fix wrong FULL feature stringYin-Chia Yeh2015-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24678065 Change-Id: I2ca49565b919c87005d941863e22e3852a01a6c6
* | | | | | Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-devEric Laurent2015-10-072-2/+25
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | ZenModeHelper: fix cross deadlock with AudioServiceEric Laurent2015-10-052-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Processing ZenModeHelper.setConfig() synchronously in ZenModeConditions.onConditionChanged() can cause a cross deadlock between ConditionProviders.mMutex and AudioService.mSettingsLock. Add a method to set Zen mode config asynchronously. Bug: 24528290. Change-Id: I9c1701ca6bef084527821175d84002b612241995
* | | | | | Merge "Ambient display now comes up immediately when a notification comes ↵Selim Cinek2015-10-062-3/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | in" into mnc-dr-dev
| * | | | | | Ambient display now comes up immediately when a notification comes inSelim Cinek2015-09-292-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously there was always a 1s delay which could even become a 5-8s delay if the Alarm was not delivered in time. Bug: 24355754 Change-Id: I1625c69719eee81403a1fcce1358d4d6c9fcf3e9
* | | | | | | am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-devAdam Lesinski2015-10-061-2/+7
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit '46684d2caeef93f43be260d996e925ea6e4147ea': Add anydpi to the providing-resources docs
| * | | | | | Merge "Add anydpi to the providing-resources docs" into mnc-devAdam Lesinski2015-10-051-2/+7
| |\ \ \ \ \ \
| | * | | | | | Add anydpi to the providing-resources docsAdam Lesinski2015-10-051-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic108d9da2e39b9f8581311fe610a1959a24a732f
* | | | | | | | Fix AudioService rotation helper threadJean-Michel Trivi2015-10-051-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a race condition where the wait index can be incremented inbetween the while() loop and the lock Fix when updateOrientation() is called: after the sleep, otherwise the last sleep is useless. Bug 24677424 Change-Id: I03770a0fc8af57f4696ebee7e9c9110e17c55a24
* | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-052-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I21cc5a0ce2710498f3aa76c904e653b90a14ecda Auto-generated-cl: translation import
* | | | | | | | Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-devTim Murray2015-10-021-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Send POWER_HINT_INTERACTION on rotate.Tim Murray2015-10-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send a POWER_HINT_INTERACTION to improve redraw performance when the phone is rotated. bug 24583227 Change-Id: I1978f0dfb9a25c00ad4da5b44d10410ad7412001
* | | | | | | | | Merge "Add minimum time for double tap gesture" into mnc-dr-devJorim Jaggi2015-10-021-3/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Add minimum time for double tap gestureJorim Jaggi2015-10-011-3/+6
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24304031 Change-Id: I15629d6b05175aea9b0d02571f6245966094f162
* | | | | | | | AudioService: alternative way of handling device rotationJean-Michel Trivi2015-10-012-55/+214
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For devices that monitor orientation (primarily for channel assignment to stereo speakers): The com.android.server.policy.WindowOrientationListener API is more power efficient than simply monitoring the device's orientation. When supported, use it instead of android.view.OrientationEventListener. When WindowOrientationListener reports an orientation change, start a thread to poll the UI orientation, as its change may lag behind the observed rotation. Gradually increasing delays between polls are stored in a table. Bug 24415763 Change-Id: I69bf68da6107af24cd02a48961dd17ceab557816
* | | | | | | am 2813b0fa: Camera2: Update video stabilization API doc.Jianing Wei2015-10-012-2/+22
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * commit '2813b0fae99fed1096dc23c3899e223459a54cec': Camera2: Update video stabilization API doc.