summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Make default selection for contact sharing to "Checked"." into mnc-devPrem Kumar2015-08-041-1/+1
|\
| * Make default selection for contact sharing to "Checked".Sanket Padawe2015-07-171-1/+1
| | | | | | | | | | Bug: 22556703 Change-Id: I33343301c4097f0e966f11a8d503ca30949e9a82
* | Merge "Set broadcast nextReceiver correctly when package is disabled" into ↵Wale Ogunwale2015-08-041-0/+4
|\ \ | | | | | | | | | mnc-dev
| * | Set broadcast nextReceiver correctly when package is disabledWale Ogunwale2015-08-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we are cleaning up broadcat receivers due to a package been disabled, it is possible to remove enough recievers to cause the nextReceiver index to be greater than the size of recievers list. We now set the nextReceiver to the size of the receiver list (which means done processing) for this case. Bug: 22874330 Change-Id: Ie151d1b5bff4c11533b3a8635fe5ee82eb21c13c
* | | Merge "Disable skipping frames on empty damage" into mnc-devJohn Reck2015-08-031-4/+5
|\ \ \
| * | | Disable skipping frames on empty damageJohn Reck2015-08-031-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22592975 Optimization added in MNC is not quite correct, occasionally it will fail to repaint when it was supposed to leading to buffer corruption. Disable the optimization for now. Change-Id: I34dfdfb357eda298198043ded7335d4588a003fd
* | | | Merge "Notify settings URI change without a lock held" into mnc-devSvetoslav Ganov2015-08-031-23/+45
|\ \ \ \
| * | | | Notify settings URI change without a lock heldSvetoslav2015-08-031-23/+45
| | |/ / | |/| | | | | | | | | | | | | | | | | | bug:22469552 Change-Id: Ie4a42ceef07e3a8e593fe2b1374420239242ce7b
* | | | Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps ↵Dianne Hackborn2015-08-034-5/+9
|\ \ \ \ | | | | | | | | | | | | | | | popping up" into mnc-dev
| * | | | Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping upDianne Hackborn2015-08-034-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slice 'em up! Change-Id: Ibba3af7ec5b7f92e6d5e55a57aa838a7f7f936e1
* | | | | Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into ↵John Reck2015-08-032-7/+30
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | mnc-dev
| * | | | Yell loudly about undefined behind in Bitmap, but work anywayJohn Reck2015-08-032-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22214367 Previous releases would let the getters on a recycle()'d bitmap to still work despite being firmly in undefined behavior per the documentation on Bitmap#recycle(). As there are apps relying on this, yell very loudly about this behavior in the log and give them a bit of time to fix it Change-Id: I857be7e74cb217877973d9c6f03eb761d12fd056
* | | | | Merge "Avoid deadlock by broadcasting outside lock." into mnc-devJeff Sharkey2015-08-031-4/+10
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Avoid deadlock by broadcasting outside lock.Jeff Sharkey2015-08-031-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can end up in a rare tangled mess when sending broadcasts while PackageManager is still trying to deal with scanAvailableAsecs(). Long-term solution is to make Environment.isExternalStorageEmulated() more robust, but for now we just send these internal broadcasts after we drop the MountService lock. Bug: 22858403 Change-Id: I7b43865782f48a679882fd1675b7b961e1292df4
* | | | | Merge "Restore session params "no decoration" flag" into mnc-devDiego Perez2015-08-031-3/+6
|\ \ \ \ \
| * | | | | Restore session params "no decoration" flagDiego Perez2015-08-031-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems to have removed from a previous version and the theme editor relies on it to remove the decoration around the preview. Change-Id: Ifab99e9c1689bfe44ca593e8c66c24e57c3e8c4c
* | | | | | Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-devDeepanshu Gupta2015-08-036-18/+17
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Revert to using AppTheme for LayoutLib tests. Fix Matrix_Delegate.native_getValues() Update test image for upated nav icons. Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. Fix bugs introduced in 78aa664.
| * | | | | Revert to using AppTheme for LayoutLib tests.Deepanshu Gupta2015-08-032-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use AppTheme for all tests other than testExpand. AppTheme contains an attribute needed by testArrayCheck. Also, since the AppTheme extends Theme.Material.Light.DarkActionBar, other tests should be unaffected. Also, update the golden image for the testArrayCheck. Change-Id: Ib5f53f3b029c5aceef2b622e5ac63952d6b1972a
| * | | | | Fix Matrix_Delegate.native_getValues()Deepanshu Gupta2015-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug manifested itself by not rendering the wifi icon in the status bar. Change-Id: I7debf3eef387965d774bf66e856812e67c8552a7
| * | | | | Update test image for upated nav icons.Deepanshu Gupta2015-07-311-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The image shows the nav icons to be separated by a significant distance. This is because the switch to wide-screen layout happens based on shortest width. The layout has a small shortest width and hence it uses the phone layout for a horizontal nav bar and it doesn't look nice. Real devices will never have this config, so it's okay. Change-Id: Ic494ee7fdfb1116db39bcab6d6ee7a1e514b23df
| * | | | | Fix typo: s/FullScreen/Fullscreen/ in LayoutLib.Deepanshu Gupta2015-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia8d223ae01f08df945ab05615b07075b98a54a32
| * | | | | Fix bugs introduced in 78aa664.Deepanshu Gupta2015-07-311-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a couple of bugs (ArrayIndexOutOfBoundsException due to miscalculation and a typo - swapped src and dst) introduced in the CL: 78aa664 Poor implementation of Path.approximate() Change-Id: Iff7dbbf66d2714df51699ddb9a4169c38feefa7b
* | | | | | Merge "Expand ringtone titles to support OGG and FLAC." into mnc-devJeff Sharkey2015-08-031-1/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Expand ringtone titles to support OGG and FLAC.Jeff Sharkey2015-08-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These file types don't have "audio/" MIME type, so check for those MIME types explicitly. Bug: 22803550 Change-Id: Ia62f94ad4a19409d6a50462935de005bc572f93a
* | | | | | Merge "Also consider task intent when trimming recent tasks" into mnc-devWale Ogunwale2015-08-031-4/+6
|\ \ \ \ \ \
| * | | | | | Also consider task intent when trimming recent tasksWale Ogunwale2015-08-021-4/+6
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7cbfcd88657ac7d5ab1baf8c964b669c9bd21e24 we stopped comparing the tasks realActivity when trimming recent task. This led to task with the same intent been duplicated in the recents list. We now consider the task intent when deciding when to trim like we did pre 510e554283d3dc250f836cd3e4abc36d87319333. Bug: 22812470 Bug: 22564474 Bug: 18642190 Change-Id: I90b3ab9cf7a06b4691099f697e723d8a54def9fa
* | | | | | Merge "Update Material link text to be colorAccent" into mnc-devAlan Viverette2015-08-032-11/+4
|\ \ \ \ \ \
| * | | | | | Update Material link text to be colorAccentAlan Viverette2015-08-032-11/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22918108 Change-Id: I29b795b4c8d2a017dcaca1a9b65705eafaf2140c
* | | | | | Merge "Don't wipe device because of short PIN, patterns or passwords" into ↵Jim Miller2015-08-032-25/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | Don't wipe device because of short PIN, patterns or passwordsJim Miller2015-08-032-25/+42
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where we were counting short PIN, patterns and passwords as attempts. For devices with a device policy admin, this would cause devices to get wiped after a short amount of interaction with the UI. Fixes bug 22844609 Change-Id: I7616b38d954f89d4a2cee23f9aec1b898041b1f2
* | | | | | Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" ↵Alan Viverette2015-08-031-4/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | Make ResolverDrawerLayout look like a ScrollView to accessibilityAlan Viverette2015-08-031-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable accessibility focus on the layout itself and expose the class name as ScrollView so that we can get auto-scroll working until we have first-class support for specifying automatic scrolling behavior. Bug: 22667764 Change-Id: I9b97e40f16038046898e5b56b935a61db9073ac6
* | | | | | | Merge "Add badge content description to TargetInfo, use in ResolverActivity" ↵Alan Viverette2015-08-032-1/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | Add badge content description to TargetInfo, use in ResolverActivityAlan Viverette2015-07-312-1/+21
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22667344 Change-Id: Iee241b9179c74a15b1c635cf90d2f96f6f7b31cd
* | | | | | | Merge "Bug: 22879202 App compatibility with WRITE_SETTINGS failing" into mnc-devBilly Lau2015-08-031-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Bug: 22879202 App compatibility with WRITE_SETTINGS failingBilly Lau2015-08-011-3/+3
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug in the app ops protected permission check that broke backwards compatibility. Change-Id: Ic73759edd29a479a670fb31407e36aa50d09b6c3
* | | | | | | Merge "Fix NPE in AppOpsService" into mnc-devSvetoslav Ganov2015-08-031-2/+6
|\ \ \ \ \ \ \
| * | | | | | | Fix NPE in AppOpsServiceSvet Ganov2015-08-021-2/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:22802981 Change-Id: I73eee5ff9cf1603d8f30355554ef075aa14afd30
* | | | | | | Merge "User correct category for finding headless sync adapters" into mnc-devSvetoslav Ganov2015-08-031-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | User correct category for finding headless sync adaptersSvet Ganov2015-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:22857409 Change-Id: Icc42f1af72c59fba3c60e1bcd558c621df70940a
* | | | | | | Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into ↵Lajos Molnar2015-08-033-38/+144
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | mnc-dev
| * | | | | | media: Clarify MediaCodec and CodecCapabilities documentationLajos Molnar2015-07-313-38/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21932760 Bug: 22847191 Change-Id: Iacd24099a98c73fe4fb50226564690aa9b01c772
* | | | | | | Merge "Make vendor keys visible in Camera2 java APIs." into mnc-devRuben Brunk2015-08-033-0/+203
|\ \ \ \ \ \ \
| * | | | | | | Make vendor keys visible in Camera2 java APIs.Ruben Brunk2015-07-313-0/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add vendor keys to getKeys() calls for CameraCharacteristics, CaptureRequest, and CaptureResult. - Vendors can specify whether custom keys show up by listing visible keys in the REQUEST_AVAILABLE_RESULT_KEYS field. - Vendor key types are always treated as a primitive (or Rational) array type corresponding to one of the valid types for a camera metadata entry. Bug: 22067625 Change-Id: I6e7dd3db7a8bf533c2ec15ff69ca38824134e971
* | | | | | | | Add more dump info about emergency calls stateJason Monk2015-08-032-2/+33
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21549528 Change-Id: Idbd70e2f4b1b3285af283a28dc1933c02ad8d04c
* | | | | | | Merge "Add per UID control to app ops." into mnc-devSvetoslav Ganov2015-08-013-58/+410
|\ \ \ \ \ \ \
| * | | | | | | Add per UID control to app ops.Svet Ganov2015-07-313-58/+410
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The app ops mananger service maintains a mapping from UID to a list of packages where each package is mapped to a list of non-default app op states (default states are inferred and not stored). Hence, specifying the app op state for a UID requires setting the app op for each package in the shared UID. This is problematic when installing new packages if there is a non-default app op policy set for another already installed package in the same UID as the app op for the new package has to be updated to be in sync. The package installer cannot do this as it is in another process and the app op update will not be atomic. Therefore, the app ops manager service has to support specifying app op policy on a per UID basis. We now have a UID state object that contains the per package non-default app op states as well as the per uid non-default app op states. If there is a UID policy specified then it takes precedence over the per package one. Even further, changing the uid policy updates the package policies in this UID if the state is non-default. Changing a package app op state also updates the app op state for the whole UID if the per UID policy for this op is non-default. Clearing the app op state for a package, clears the policy for the UID as well. bug:22802981 Change-Id: I78044906d9fcc6066abf07e706c2c88f3397d293
* | | | | | | Merge "Added logging in a few error paths for wifi config installation." ↵Jan Nordqvist2015-08-011-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | Added logging in a few error paths for wifi config installation.Jan Nordqvist2015-07-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22790527 Change-Id: I71b298b98da098f647f52886c3c3a7456cb24d51
* | | | | | | | Merge "Instrument printing service for metrics collection." into mnc-devChris Wren2015-08-012-0/+6
|\ \ \ \ \ \ \ \