Merge commit '0358def77633b6548da06985cb22955a7e85abac'
* commit '0358def77633b6548da06985cb22955a7e85abac':
DO NOT MERGE Overscroll continues; asset and behavior tweaks.
Merge commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211' into gingerbread-plus-aosp
* commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211':
DO NOT MERGE Overscroll continues; asset and behavior tweaks.
Merge commit '75823339cd03e5b25b576cd7a2b5941254017c4a'
* commit '75823339cd03e5b25b576cd7a2b5941254017c4a':
Fix a small bug when granting permissions through activity results.
Merge commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4' into gingerbread-plus-aosp
* commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4':
Fix a small bug when granting permissions through activity results.
Merge commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986' into gingerbread-plus-aosp
* commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986':
Clean up some permissions.
Merge commit '14d56840eeec537c037bebaeaebf1b37f48d8dad'
* commit '14d56840eeec537c037bebaeaebf1b37f48d8dad':
Improve messages when java process is starting.
Note that WRITE_OWNER_DATA and READ_OWNER_DATA don't actually appear
to be associated with anything or used by anyone, so they are just
deleted.
Also deprecate the activity API to go in the foreground. I didn't
realize that was released in the SDK. It needs to go away.
Change-Id: I96f53702c2c79e4999b6b2c498abb770bd27e03a
Merge commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1' into gingerbread-plus-aosp
* commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1':
Improve messages when java process is starting.
This reverts commit 28961cc02f which causes this exception:
E/SystemServer( 2653): Failure starting Connectivity Service
E/SystemServer( 2653): java.lang.IllegalMonitorStateException: object not locked by thread before wait()
E/SystemServer( 2653): at java.lang.Object.wait(Native Method)
E/SystemServer( 2653): at java.lang.Object.wait(Object.java:358)
E/SystemServer( 2653): at com.android.server.ConnectivityService$ConnectivityThread.getServiceInstance(ConnectivityService.java:186)
E/SystemServer( 2653): at com.android.server.ConnectivityService.getInstance(ConnectivityService.java:200)
E/SystemServer( 2653): at com.android.server.ServerThread.run(SystemServer.java:262)
Change-Id: Idd139e426e61a1913b0bf343e2f0a0b1990ba8bb
This change adds a second timeout to the SecuritySettings page
separate from the standard display timeout.
Change-Id: I41fe10e31688308f52695ad3ee30a4b0507112bd
Merge commit '9fadca71e455a6c849311083677351d4dc64b792'
* commit '9fadca71e455a6c849311083677351d4dc64b792':
DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
Javadoc annotations aren't enough to properly mark an API
as deprecated. This change adds the @Deprecated annotation
to the source and updates current.xml.
Change-Id: I04a398fc04ad99979c674789af5af994fbd25be0
Merge commit 'b766ab830a714c0b79f64265e681f454865ffe65' into gingerbread-plus-aosp
* commit 'b766ab830a714c0b79f64265e681f454865ffe65':
DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
Previous changes only added javadoc annotation, but didn't apply
annotation to the source. Fixing this and updating current.xml.
Change-Id: I52aabd6485a3972fc360f24c2e86cc342a5101ab
Merge commit '3424c02e6b931a8bbd651ae75217bebd008b2605' into gingerbread-plus-aosp
* commit '3424c02e6b931a8bbd651ae75217bebd008b2605':
Add software features for SIP and VOIP
Merge commit 'fd0eed007d99178092ede56ec2c4799046615f70'
* commit 'fd0eed007d99178092ede56ec2c4799046615f70':
Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.
Merge commit '3fd01c4da9b8fb7796d64096b9bbd6fcdee280e6'
* commit '3fd01c4da9b8fb7796d64096b9bbd6fcdee280e6':
Make sure that if initialization fails, AudioSource still behaves well.
Merge commit '61f1cbdd71942433ce1515b614ec3d9c259ea037'
* commit '61f1cbdd71942433ce1515b614ec3d9c259ea037':
Adding a feature definition corresponding to support for Near-Field
Merge commit '9088a3d153ef28dfa383fda0935d99bdc0c2b2f6'
* commit '9088a3d153ef28dfa383fda0935d99bdc0c2b2f6':
Fix logic error in downgrade of system apps
Merge commit '6fb81376b6e062d9b0ce4d91e23c2a88572b8186'
* commit '6fb81376b6e062d9b0ce4d91e23c2a88572b8186':
DO NOT MERGE Integrate edge effects into WebView.
Merge commit 'a2511da9d65b11be7f59ed3f525f77e85aeb4bef' into gingerbread-plus-aosp
* commit 'a2511da9d65b11be7f59ed3f525f77e85aeb4bef':
Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.
Merge commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3' into gingerbread-plus-aosp
* commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3':
Make sure that if initialization fails, AudioSource still behaves well.
Fixes part of emulator which isn't telling us about dns servers.
Gets some stuff running, but browser is still broken.
bug:2961703
Change-Id: I53b946eba434aca1bb524c2acaf77922377948d1
