summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Change MNC codename to just M." into mnc-devDianne Hackborn2015-07-3124-73/+65
|\
| * Change MNC codename to just M.Dianne Hackborn2015-07-2924-73/+65
| | | | | | | | Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
* | Merge "Add telecom extra keys required for DMR release." into mnc-devTyler Gunn2015-07-314-0/+38
|\ \
| * | Add telecom extra keys required for DMR release.Tyler Gunn2015-07-304-0/+38
| | | | | | | | | | | | | | | Bug: 22848290 Change-Id: I3328234e3f07d83d0dbe5b61b959344b6cc5cc3f
* | | Merge "Fix SysUI crash on device boot." into mnc-devJulia Reynolds2015-07-311-10/+12
|\ \ \
| * | | Fix SysUI crash on device boot.Julia Reynolds2015-07-311-10/+12
| | | | | | | | | | | | | | | | | | | | Bug: 22869066 Change-Id: I55ab64c430899ebc20bfc8a8e4d1e2a7cd12f0cd
* | | | Merge "Don't always transfer device owner status to other users." into mnc-devRubin Xu2015-07-311-2/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Don't always transfer device owner status to other users.Nicolas Prevot2015-07-311-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A device owner cannot use device or profile owner policies on other users unless it is profile owner there. Also limit device initializer to system apps only. Bug: 21800830 Change-Id: Ie1abbd891945b91b17ecdf7f73ba93aaa19819be
* | | | Merge "Add missing return statement" into mnc-devBenjamin Franz2015-07-311-0/+1
|\ \ \ \
| * | | | Add missing return statementBenjamin Franz2015-07-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22844272 Change-Id: I4b37b28adb1d1b6d0d1235dd68fbfad6c3121c54
* | | | | Merge "Stop supporting legacy ConnectivityManager routing methods in M." ↵Lorenzo Colitti2015-07-313-5/+74
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | Stop supporting legacy ConnectivityManager routing methods in M.Lorenzo Colitti2015-07-313-5/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The methods startUsingNetworkFeature, stopUsingNetworkFeature and requestRouteToHost were @removed in all the M preview builds, but internal and external developers have noted that this imposes additional burden for applications that need to work across multiple platform versions because it causes compile-time errors. We switched from @removed back to @deprecated to avoid these problems. In order to effectively deprecate these methods, which are error-prone and insecure, make them throw UnsupportedOperationException if the app's target SDK is M or above. Because there are still one or two places in system code that use these APIs, exempt Process.SYSTEM_UID and the OMA-DM client from the check for now. Bug: 22728205 Change-Id: I790bd32f3aa8067cbb625962a209bb9232f4b58c
* | | | | | Merge changes from topic 'fix-notification-inflation-2' into mnc-devDave Langemak2015-07-312-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Make DateTimeView more robust to weird contexts. Make the RemoteViews context safe for Icons.
| * | | | | | Make DateTimeView more robust to weird contexts.Dan Sandler2015-07-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, some clients (*ahem* SystemUI) have been known to inflate RemoteViews with unusual derived contexts that may not have valid application contexts. DateTimeView can now resist this. Bug: 22852700 Change-Id: I5e91ae0e66859f5f5efd7b19c0ae6dfbc26bcc54
| * | | | | | Make the RemoteViews context safe for Icons.Dan Sandler2015-07-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Icon needs the RemoteViews' internal context to reflect not just the Resources of the originating application, but its package name as well. Bug: 22840771 Bug: 22852700 Change-Id: I1164cd38d99283982b00daadcf927c7cf63539b3
* | | | | | | Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-devHung-ying Tyan2015-07-311-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Revise lockdown check in getLegacyVpnInfo()Hung-ying Tyan2015-07-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return null instead of raising exception in lockdown mode. BUG=22749146 Change-Id: I0e9e3ded0d189e3fa9e872b7af9fe363799c85d6
* | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-3178-43/+199
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-3078-43/+199
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 22826906 Change-Id: If1cb05eb42e8e5bd789cdb257dfc3498e4479890
* | | | | | | | Merge "media: use blocks number to find closest size" into mnc-devRonghua Wu2015-07-311-5/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | media: use blocks number to find closest sizeRonghua Wu2015-07-301-5/+10
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22504214 Change-Id: I056e19ac5fdbdff2c5d297b600210c07ae5ed4f4
* | | | | | | Merge "Handle volumes without visible paths." into mnc-devJeff Sharkey2015-07-311-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Handle volumes without visible paths.Jeff Sharkey2015-07-301-1/+5
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transient volumes like USB drives are not mounted as visible, so we shouldn't be kicking off media scanner for them. Bug: 22545248 Change-Id: Ic8f2d3134f1edb8b2a12e8ff283eceeeb230f48b
* | | | | | | Merge "AAPT: Fix resource versioning" into mnc-devAdam Lesinski2015-07-311-18/+52
|\ \ \ \ \ \ \
| * | | | | | | AAPT: Fix resource versioningAdam Lesinski2015-07-281-18/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resource generation was greedy, so when an attribute with sdk level 21 was used in a resource with v1, and a different attribute with sdk level 21 was used in a resource with v11, a v21 resource would be synthesized, but it would contain the attribute from v1 instead of v11. This change fixes the issue, having the higher versioned resource take precedence. Bug:22793816 Change-Id: Ia687f56b0d9969e424111477d55d9804255b22e9
* | | | | | | | Merge "The heads up now correctly dissapears when clicking" into mnc-devSelim Cinek2015-07-307-2/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | The heads up now correctly dissapears when clickingSelim Cinek2015-07-307-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22729955 Change-Id: I977b36823bf936baab527f932b1e5576241f4d71
* | | | | | | | | Merge "Add OrSelf to privileged permission check." into mnc-devAmit Mahajan2015-07-302-10/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add OrSelf to privileged permission check.Amit Mahajan2015-07-302-10/+13
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22857263 Change-Id: Ide7105dfd653e3c271330822fb8cee7cf620e35d
* | | | | | | | | Merge "BatteryStats: include mobile radio active count and unknown time in ↵Adam Lesinski2015-07-301-1/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkin" into mnc-dev
| * | | | | | | | | BatteryStats: include mobile radio active count and unknown time in checkinAdam Lesinski2015-07-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are important values to help diagnose modem related wakeup issues. Bug:22803686 Bug:22857991 Change-Id: Ie0164ebd194567bc10d1165d671a583674a39829
* | | | | | | | | | Bluetooth: Don't call beginBroadcast() while in a broadcastAndre Eisenbach2015-07-301-41/+71
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Block duplicate calls to beginBroadcast() and add try/finally to ensure finishBroadcast() is always called. Bug: 22800686 Change-Id: Ie8d4005f4cd50dd2544a2832773d72eab0015d92
* | | | | | | | | Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-devCarlos Valdivia2015-07-303-127/+199
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Permissions: GET_ACCOUNTS permission cleanupCarlos Valdivia2015-07-303-127/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, getAccounts*() will now return all available accounts depending on both GET_ACCOUNTS grants and signature matching. This is different from before where a caller of getAccounts() would need GET_ACCOUNTS to get any accounts, but if that same caller called getAccountsByType, they might have gotten back accounts if they shared a signature with the same developer. Second, cleaned up some NPEs and javadoc. This change was motivated by progress on the cts tests. Change-Id: I2f36226780e074fdf58214b46de3b79d8319ace1
* | | | | | | | | | Merge changes I4c215676,Ib476302c,I0aede288,I9241dec7,Ibe7167a6, ... into ↵Deepanshu Gupta2015-07-309-44/+112
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * changes: Update status bar time. Fix imports. Add MockView constructor used by LayoutInflater. Poor implementation of Path.approximate() Include EpicenterTranslateClipReveal in LayoutLib Fix theme namespace in tests. LayoutLib: fix layout when nav bar is absent. LayoutLib: Fix Status/Navigation Bar color.
| * | | | | | | | | | Update status bar time.Deepanshu Gupta2015-07-291-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy the value from the demo mode (commit 33b60bb45f) Change-Id: I4c215676e7ae26a68aa370e99db005226d8a05d9
| * | | | | | | | | | Fix imports.Deepanshu Gupta2015-07-293-23/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove null checks on return value of ReflectionUtils.getMethod() as the method always return non null. Change-Id: Ib476302c2cf0504a0f54db4e795955ad10e5df3f
| * | | | | | | | | | Add MockView constructor used by LayoutInflater.Deepanshu Gupta2015-07-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0aede28866c1b87fb66c8a416c5026a9b2cb04fe
| * | | | | | | | | | Poor implementation of Path.approximate()Deepanshu Gupta2015-07-291-3/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include a very poor implementation of Path.approximate() in LayoutLib that only returns the first and last coordinate of the path. This avoids crashing the rendering when certain assumptions are made on the value returned from the method. Also change the error to a warning. Change-Id: I9241dec734d4df90a9eebd1e6de8b3e443eee3c8
| * | | | | | | | | | Include EpicenterTranslateClipReveal in LayoutLibDeepanshu Gupta2015-07-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed by Spinner to create transitions that are then ignored :) Change-Id: Ibe7167a643ecb186e97c9af446c0e1d2eb2d6f86
| * | | | | | | | | | Fix theme namespace in tests.Deepanshu Gupta2015-07-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests used framework theme (Material), but the ResourceResolver was created with project theme. This caused tests to fail becasue of missing resources. Change-Id: Ia17ee19054f6689f85e3423e83c1f47a2cc4364f
| * | | | | | | | | | LayoutLib: fix layout when nav bar is absent.Deepanshu Gupta2015-07-281-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0d3ee6fd5a4656156a630d3b298533ea13eb8415
| * | | | | | | | | | LayoutLib: Fix Status/Navigation Bar color.Deepanshu Gupta2015-07-271-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the color value for status bar or navigation bar is declared directly in the theme (i.e. doesn't reference a color resource via @color/foo), the ResourceType for the attribute is not assigned by the IDE. LayoutLib used to ignore resources that were not of type color. This change fixes the issue by also checking the resources without a type. Change-Id: I94735ec225415282db06ab9db5c3233ad89c052f
* | | | | | | | | | | Merge "Fixed a heads up crash" into mnc-devSelim Cinek2015-07-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed a heads up crashSelim Cinek2015-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some references to notifications were still kept around while timing out, leading to small leaks and sometimes crashes. Bug: 22819475 Change-Id: I1429b5669366521c6374efbcae6c26d6e407d8cc
* | | | | | | | | | | | Merge "UsbMidiDevice: add timestamps for input events" into mnc-devPhil Burk2015-07-301-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | UsbMidiDevice: add timestamps for input eventsPhil Burk2015-07-291-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will improve the accuracy of recorded MIDI performances. Bug: 22801515 Change-Id: Ib78bc929224f2f27938c83a815eaa62f6b5f9560 Signed-off-by: Phil Burk <philburk@google.com>
* | | | | | | | | | | | | Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-devPhil Burk2015-07-301-1/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | MIDI docs BTLE: how to open BTLE MIDI devicesPhil Burk2015-07-291-1/+50
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds crucial information including required permissions, MIDI UUID, and call to openBluetoothDevice(). Bug: 22606182 Change-Id: I47393bd0ecc2601906f6e50075d694c9cc17c993 Signed-off-by: Phil Burk <philburk@google.com>
* | | | | | | | | | | | | Merge "MIDI package doc: add hasSystemFeature() call" into mnc-devPhil Burk2015-07-301-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-01-22 19:11:04 +0000