summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 0da3bdb4: Fix public API caused due to CDMA changes.Jaikumar Ganesh2009-07-305-44/+797
|\ | | | | | | | | | | | | Merge commit '0da3bdb476086db02a1076780676b21e239c79d6' * commit '0da3bdb476086db02a1076780676b21e239c79d6': Fix public API caused due to CDMA changes.
| * Fix public API caused due to CDMA changes.Jaikumar Ganesh2009-07-305-44/+797
| |
* | am 6af2552d: use safeUnref() since the other macro is not defined in donutMike Reed2009-07-302-2/+2
|\ \ | |/ | | | | | | | | | | Merge commit '6af2552d244ff933dfd54570121db455cc7c3cda' * commit '6af2552d244ff933dfd54570121db455cc7c3cda': use safeUnref() since the other macro is not defined in donut
| * use safeUnref() since the other macro is not defined in donutMike Reed2009-07-302-2/+2
| |
* | am 7299d6ad: Merge change 9159 into donutAndroid (Google) Code Review2009-07-302-16/+26
|\ \ | |/ | | | | | | | | | | Merge commit '7299d6ad9820bbb601034542c94d6dc73cc4829d' * commit '7299d6ad9820bbb601034542c94d6dc73cc4829d': check for null native objects, which never happens on a real subclass (we throw in that case)
| * Merge change 9159 into donutAndroid (Google) Code Review2009-07-302-16/+26
| |\ | | | | | | | | | | | | * changes: check for null native objects, which never happens on a real subclass (we throw in that case) but can happen because we allow the callers to create the base class from java.
| | * check for null native objects, which never happens on a real subclass (we ↵Mike Reed2009-07-302-16/+26
| | | | | | | | | | | | | | | | | | throw in that case) but can happen because we allow the callers to create the base class from java.
* | | am 67fb5728: Merge change 9147 into donutAndroid (Google) Code Review2009-07-302-5/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '67fb5728332f7e3f8c11245fb9cb9d1cfe2b5607' * commit '67fb5728332f7e3f8c11245fb9cb9d1cfe2b5607': Fix in-app search shortcut icons
| * | Merge change 9147 into donutAndroid (Google) Code Review2009-07-302-5/+12
| |\ \ | | | | | | | | | | | | | | | | * changes: Fix in-app search shortcut icons
| | * | Fix in-app search shortcut iconsBjorn Bringert2009-07-302-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the suggstion provider is in a different package from the searchable activity, the icons stored for shortcuts used the package of the activity instead of the provider. Fixes http://b/issue?id=2023993
* | | | am 4598d149: Merge change 9145 into donutAndroid (Google) Code Review2009-07-301-0/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '4598d149fb9c081877a214d74efadcb60d2acbb9' * commit '4598d149fb9c081877a214d74efadcb60d2acbb9': Add the encryption option to PptpProfile parcel.
| * | | Merge change 9145 into donutAndroid (Google) Code Review2009-07-301-0/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Add the encryption option to PptpProfile parcel.
| | * | | Add the encryption option to PptpProfile parcel.Hung-ying Tyan2009-07-301-0/+14
| | | | |
* | | | | am b203a57d: Merge change 9114 into donutAndroid (Google) Code Review2009-07-3010-102/+269
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b203a57d1f00fe509e0d065cd928099bb7d19d87' * commit 'b203a57d1f00fe509e0d065cd928099bb7d19d87': Add state saving mechanism to support proc restart
| * | | | Merge change 9114 into donutAndroid (Google) Code Review2009-07-3010-102/+269
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * changes: Add state saving mechanism to support proc restart
| | * | | Add state saving mechanism to support proc restartHung-ying Tyan2009-07-3010-102/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also... + stop daemons before getting server IP; + remove setForeground(); + add the DBG flag for Log.d calls. PatchSet 3: + add CHALLENGE_ERROR and REMOTE_HUNG_UP to VpnManager + broadcast new error codes in VpnService + check local IP change instead of dns change + move removeStates() to VpnService.onFinalCleanUp() PatchSet 7: + add encryption flag to PptpProfile + PptpService and MtpdHelper are revised accordingly
* | | | | am f4692640: Add unit tests for netkeystore.Chung-yih Wang2009-07-303-7/+308
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f4692640a8c40b8bbba1f00841c2f8fbe7b28d7a' * commit 'f4692640a8c40b8bbba1f00841c2f8fbe7b28d7a': Add unit tests for netkeystore.
| * | | | Add unit tests for netkeystore.Chung-yih Wang2009-07-303-7/+308
| | |/ / | |/| | | | | | | | | | + some boundary checks.
* | | | am 73139aea: Merge change 9075 into donutAndroid (Google) Code Review2009-07-301-5/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '73139aead7203c22f3a4abb5e9fd8abd5ef249b1' * commit '73139aead7203c22f3a4abb5e9fd8abd5ef249b1': Change the resource path for fwd locked apps when scanning the fwd locked install
| * | | Merge change 9075 into donutAndroid (Google) Code Review2009-07-291-5/+18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Change the resource path for fwd locked apps when scanning the fwd locked install directory
| | * | | Change the resource path for fwd locked apps when scanning the fwd locked ↵Suchi Amalapurapu2009-07-291-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install directory
* | | | | am 25dff70f: Merge change 9039 into donutAndroid (Google) Code Review2009-07-3018-31/+206
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '25dff70f153529b87f5ad4a92f4de21e8950b1de' * commit '25dff70f153529b87f5ad4a92f4de21e8950b1de': Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA
| * | | | Merge change 9039 into donutAndroid (Google) Code Review2009-07-2918-31/+206
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * changes: Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA
| | * | | Fix #2018814: System cannot correctly render assets with "wrap_content" ↵Dianne Hackborn2009-07-2918-31/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attribute in QVGA It turns out we were not returning the density for anything retrieved from a TypedArray... which basically means any bitmap references from a layout or style...!!! This is now fixed. Also fiddle with the density compatibility mode to turn on smoothing in certain situations, helping the look of things when they need to scale and we couldn't do the scaling at load time.
* | | | | Merge change 9245Android (Google) Code Review2009-07-301-2/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Remove android:multiprocess from ShutdownActivity to ensure it runs in the system process.
| * | | | | Remove android:multiprocess from ShutdownActivity to ensure it runs in the ↵Mike Lockwood2009-07-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | system process. Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | Merge change 9236Android (Google) Code Review2009-07-304-217/+97
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Implement bitmap resource loaders for utility. cleanup rolloRS and checkin maps.png which was missing.
| * | | | | | Implement bitmap resource loaders for utility. cleanup rolloRS and checkin ↵Jason Sams2009-07-304-217/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | maps.png which was missing.
* | | | | | | Merge change 9070Android (Google) Code Review2009-07-302-0/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Adding resizeInput and setAttributes for overlay
| * | | | | | | Adding resizeInput and setAttributes for overlayBenny Wong2009-07-292-0/+18
| | | | | | | |
* | | | | | | | Merge change 9198Android (Google) Code Review2009-07-301-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix missed Aggregate->Contact name change.
| * | | | | | | | Fix missed Aggregate->Contact name change.Evan Millar2009-07-301-3/+3
| | | | | | | | |
* | | | | | | | | Merge changes 9206,9207Android (Google) Code Review2009-07-302-2/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix a debug statement in BufferMapper NPOT EGLimage without GL_ARB_texture_non_power_of_two would be improperly scalled
| * | | | | | | | | Fix a debug statement in BufferMapperMathias Agopian2009-07-301-1/+1
| | | | | | | | | |
| * | | | | | | | | NPOT EGLimage without GL_ARB_texture_non_power_of_two would be improperly ↵Mathias Agopian2009-07-301-1/+2
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scalled The current gralloc allocates buffer memory for render targets that will typically have NPOT dimensions. Assuming that the vendor driver supports converting the resulting NPOT android_native_buffer_t to a NPOT EGLImage, SurfaceFlinger calls glEGLImageTargetTexture2DOES(), and uses glGetError() to test whether the GL can support creating an EGL target texture with the specified NPOT EGLImage. If it is supported, the DIRECT_TEXTURE flag remains set, otherwise it is cleared. Tangentially, if the driver advertises the GL_ARB_texture_non_power_of_two extension, the NPOT_EXTENSION flag is set, otherwise it is cleared. If the driver supported creating an EGL target texture from a NPOT source EGLImage, it implicitly creates a NPOT texture. This does not need any glScalef() texture coordinate correction in LayerBase::drawWithOpenGL(). However, the same driver may not advertise the GL_ARB_texture_non_power_of_two extension nor generally support NPOT textures that were not derived from EGLImages. So SurfaceFlinger may flag only DIRECT_TEXTURE, not NPOT_EXTENSION. Therefore, the test in LayerBase::drawWithOpenGL() should only perform the glScalef() if neither NPOT_EXTENSION or DIRECT_TEXTURE are flagged. Otherwise scaling is applied to NPOT EGL target textures when none is required.
* | | | | | | | | Merge change 9175Android (Google) Code Review2009-07-302-176/+160
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix 2016808. We used to send the new scale/scroll info to the UI thread after WebCore finish the first layout. As the picture in the UI thread is still the previous one, if there is a UI update happened before we generate the new picture, the new scale/scroll will be applied to the old picture.
| * | | | | | | | | Fix 2016808. We used to send the new scale/scroll info to the UI thread afterGrace Kloba2009-07-302-176/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore finish the first layout. As the picture in the UI thread is still the previous one, if there is a UI update happened before we generate the new picture, the new scale/scroll will be applied to the old picture. On the other hand, we do want to trigger the resize for the new page after the first layout. e.g. The page was at nytimes.com. Now user types google.com. google.com is first layout in the wide viewport where nytimes.com is. We dont want to show that picture. We would like to show the fit to screen version of google.com as the first picture. Remove the SnapToAnchor code which is left over from previous zoom attempt.
* | | | | | | | | | Merge change 9193Android (Google) Code Review2009-07-302-5/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Remove hardcoded maximum frame rate limit from the framework bug 1993400
| * | | | | | | | | Remove hardcoded maximum frame rate limit from the frameworkJames Dong2009-07-302-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 1993400
* | | | | | | | | | Add Activity Intent.ACTION_REQUEST_SHUTDOWN for requesting a system shutdown.Mike Lockwood2009-07-303-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Intent.EXTRA_KEY_CONFIRM extra can be set to require user confirmation before shutting down. The ACTION_REQUEST_SHUTDOWN Intent is protected by android.permission.SHUTDOWN. Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | Represent SID/NID in decimal format.johnwang2009-07-302-4/+14
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Interpret SID/NID ad decimal and add try/catch block to prevent crashing in wrong format. Update SID/NID comments. modified: java/com/android/internal/telephony/CommandsInterface.java modified: java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
* | | | | | | | | am b91e2b02: Merge change 9073 into donutAndroid (Google) Code Review2009-07-301-1/+25
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b91e2b0292f9f4f76175a18e6e3cf392f3967ae8' * commit 'b91e2b0292f9f4f76175a18e6e3cf392f3967ae8': Special-case search within the browser to not show the app icon
| * | | | | | | | Merge change 9073 into donutAndroid (Google) Code Review2009-07-291-1/+25
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * changes: Special-case search within the browser to not show the app icon to the left of the search field. Also, because this removes context about whether you're in browser search or global search, we make sure to clear any entered text if you jump out to global search from within browser search.
| | * | | | | | | Special-case search within the browser to not show the app iconMike LeBeau2009-07-291-1/+25
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the left of the search field. Also, because this removes context about whether you're in browser search or global search, we make sure to clear any entered text if you jump out to global search from within browser search. This is a really ugly hack, but was required by the UI team. We will find a better way to reconcile in Eclair.
* | | | | | | | am c6eb5ac9: Merge change 9071 into donutAndroid (Google) Code Review2009-07-302-3/+46
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c6eb5ac988518f41938c4f021003d6c202d84819' * commit 'c6eb5ac988518f41938c4f021003d6c202d84819': Fix issue #2018454: NullPointerException in ImageSpan constructor
| * | | | | | | Merge change 9071 into donutAndroid (Google) Code Review2009-07-292-3/+46
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix issue #2018454: NullPointerException in ImageSpan constructor
| | * | | | | | | Fix issue #2018454: NullPointerException in ImageSpan constructorDianne Hackborn2009-07-292-3/+46
| | | | | | | | |
* | | | | | | | | am 9c71716e: Merge change 9063 into donutAndroid (Google) Code Review2009-07-301-6/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9c71716e3de9b6a7e1830cae13da35ebdeeaaa80' * commit '9c71716e3de9b6a7e1830cae13da35ebdeeaaa80': Fixing bug #2023024 - there is an out of bounds exception that
| * | | | | | | | Merge change 9063 into donutAndroid (Google) Code Review2009-07-291-6/+13
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fixing bug #2023024 - there is an out of bounds exception that can happen if services are going away as the AccessibilityManagerService is trying to dispatch notifications to these services. Catching this exception and bailing because having this exception means that there are no more services around that need to get this notification.
| | * | | | | | | Fixing bug #2023024 - there is an out of bounds exception thatCharles Chen2009-07-291-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can happen if services are going away as the AccessibilityManagerService is trying to dispatch notifications to these services. Catching this exception and bailing because having this exception means that there are no more services around that need to get this notification.
generated by cgit v1.1 at 2024-10-27 13:20:58 +0000