drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
146,751 Commits 1 Branch 0 Tags
Commit Graph

146751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yao Chen
4056871031 Adds toString() in MediaBrowserItem 
Bug: 16676746
Change-Id: I61152dca66e6715807868a5c72a1fdf06c78d7ab
 2014-07-30 15:36:25 -07:00
Ruben Brunk
3fe9eba904 camera2: Add scene and effect mode for LEGACY. 
Bug: 15116722

Change-Id: I0797fccb5fdd8b959622c100f25b2950cfe4e115
 2014-07-30 22:09:41 +00:00
Adam Lesinski
63e646eed5 Add shared library support to aapt dump 
AAPT dump should be able to handle dynamic references
that often come with shared library resources.

Bug:16678251
Change-Id: I6c8cd943145aab20ca9db9694c8c433b3c64279b
 2014-07-30 21:53:48 +00:00
Behdad Esfahbod
805f6ebf17 Support FontFeatureSettings in Paint 
New API is hidden.

Bug: 15246510
Change-Id: Idefca06a366de0d87f53d123b5291788448de4d0
 2014-07-30 21:38:23 +00:00
Andres Morales
e9a8927662 Merge "Revert "NFC Unlock api changes"" into lmp-dev 2014-07-30 19:31:16 +00:00
Andres Morales
92b4b3c64d Revert "NFC Unlock api changes" 
This reverts commit 9fef5fbcd6d47ef86823b3a2d82d34801f9be335.

Change-Id: Idabe1c2901e0e26d38f84583308f69804ab2c1c3
 2014-07-30 21:30:50 +00:00
Andres Morales
131197aa6e NFC Unlock api changes 
Bug: 16401635
Change-Id: I138a9aa0bb156982b6c7656c51a1e2194776e4ed
 2014-07-30 21:17:06 +00:00
Joe Fernandez
9386003cb9 am a3e52154: am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 
* commit 'a3e521540b1143264033ca217d11b90ec20e6c54':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
 2014-07-30 21:14:39 +00:00
Alan Lau
d38347ec51 am 40274ada: (-s ours) am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev 
* commit '40274ada4a8699a18836c369ca26ebb837ca37f2':
  Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
 2014-07-30 21:14:33 +00:00
Alan Lau
6a93d9d346 am 839ca0d5: (-s ours) am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev 
* commit '839ca0d5fa3b22e1e27aa8110d665aa6b6b91e26':
  Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""
 2014-07-30 21:14:29 +00:00
Alan Viverette
46359204a8 Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 2014-07-29 21:36:00 +00:00
Alan Viverette
0c0dde7171 Update switch assets, fix SearchView asset 9-patch areas 
BUG: 16606037
BUG: 16467249
Change-Id: I9a5888e37317d1f8a6481f9733f784bbd37268f3
 2014-07-30 13:37:35 -07:00
keunyoung
fa75e3d465 Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev 2014-07-29 21:36:00 +00:00
keunyoung
1d0a7ccd00 add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode 
- When this flag is set, system no longer keeps the display on while in car mode.

bug: 15472822
Change-Id: I277368be5227eaf96213684598f278c39e4c34db
 2014-07-30 14:12:34 -07:00
Martijn Coenen
0bc94550b4 Merge "Make some NFC APIs @systemAPI." into lmp-dev 2014-07-29 21:36:00 +00:00
Martijn Coenen
29c2e3797a Make some NFC APIs @systemAPI. 
Change-Id: I12e292563a517211e4fae7a1f64021758f396d1a
 2014-07-30 21:03:07 +00:00
Jason Monk
e47df8466b Allow System UI access to VPN. 
Bug: 16153201
Change-Id: I5f5e9e0ed3e4e02d6a6995011356b350758f068d
 2014-07-30 20:51:14 +00:00
Raph Levien
ed1e6962ba Merge "Bump refcount of canvas created for Picture" into lmp-dev 2014-07-30 20:38:44 +00:00
Raph Levien
febccd05f2 Bump refcount of canvas created for Picture 
Both the Canvas and Picture objects will unref the canvas in their
finalizers, so an extra ref is needed. This had been present but was
inadvertently removed in the patch "Refactor android.graphics.Picture
JNI bindings." This patch simply restores the previous ref and comment.

Bug: 16399257
Change-Id: I9911826bd0e668bd25546ef54b0c9c1d467538c8
 2014-07-30 13:41:10 -07:00
Sean Wan
a5d3e0308e Merge "Fixed a NullPointerException in AccountManagerService." into lmp-dev 2014-07-25 23:00:08 +00:00
Adili Muguro
4e68b65723 Fixed a NullPointerException in AccountManagerService. 
Change-Id: If65d7870c609ae6c7467e26978ffd0ce0d52f518
 2014-07-30 14:10:16 -07:00
Robert Ly
36da7fe10f Merge "resolved conflicts for merge of 60e7f541 to lmp-dev" into lmp-dev 2014-07-30 19:31:16 +00:00
Robert Ly
0f9ea26dcc resolved conflicts for merge of 60e7f541 to lmp-dev 
Conflicts:
	docs/html/google/play/billing/gp-purchase-status-api.jd

Change-Id: I23f4c1a366b894a3cf5f70e26b32cd88bc66784c
 2014-07-30 14:09:25 -07:00
Lorenzo Colitti
691ed0561d Merge "Add logging of Legacy Type info." into lmp-dev 2014-07-24 16:04:26 +00:00
Robert Greenwalt
d49ac33b5e Add logging of Legacy Type info. 
There are some bugs where getActiveNetworkInfo gives bad data (seemingly)
and this will give the backing data in logs.

bug:16610051
Change-Id: Iad867485ad78daeb3e88665dcd0fdb0af756a3bf
 2014-07-30 16:31:24 -07:00
Youngsang Cho
8db80b6742 Merge "TIF: Reset SurfaceView whenever TvView tunes to a channel of different TV input" into lmp-dev 2014-07-24 16:04:26 +00:00
Youngsang Cho
71b282fad4 TIF: Reset SurfaceView whenever TvView tunes to a channel of different TV input 
Bug: 14254494
Change-Id: Ieb6b0cb95a366995c7b85beea7eb9ca8507d5531
 2014-07-31 13:29:31 +09:00
Lorenzo Colitti
5b37fa2ed5 Allow using third-party HTTP/... stacks for per-network URLs. 
Also switch to double-checked locking for
mNetworkBoundSocketFactory and OkHttpClient.

Change-Id: Ic52776ee760036ad5623b7496156b8909dc282fa
 2014-07-31 02:17:28 +00:00
Yuncheol Heo
4b54271f1b Don't clear local device when it goes to the standby mode. 
Some OEM/SOC will keep passing the received packets until the
application processor goes to the sleep mode actually.  so we'll
not clear the local devices to get the received packets and react
like in the standby mode.

Bug: 16661406
Change-Id: I6eb9c21877a29905bb0084256dc6692fe0d07170
 2014-07-31 10:31:15 +09:00
Shishir Agrawal
31ac7552fd Merge "Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager." into lmp-dev 2014-07-25 23:01:28 +00:00
Shishir Agrawal
a122e8df74 Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager. 
The new APIs are needed to support SEEK.

Also modifies TelephonyManager.iccOpenLogicalChannel to return the status of
the command.

Change-Id: Iff2674fb0e23210f2579cb883e64571347ade5e6
 2014-07-30 18:09:53 -07:00
Sandeep Siddhartha
90521b2829 Merge "Tighten the checks around a detector being invalidated" into lmp-dev 2014-07-24 15:36:21 +00:00
Sandeep Siddhartha
668327d028 Tighten the checks around a detector being invalidated 
Don't call back for a detector being marked invalid because
that happens when someone else obtains a detector or VIS shuts down,
in either case we don't want a loop where two entities keep creating new detectors
and being invalidated.

Don't call back on an invalid detector for availability change/detected/started and stopped
only propagate errors.

This helps us with cases where a callback for the previous VIS may get called and then crash because it
tries to make calls without being the current VIS.

In the new scheme of things, if the VIS changes, or the current VIS obtains a new AlwaysOnHotwordDetector,
the previous one is shutdown and internally marked as invalid and all calls to it fail with an IllegalStateException.

Bug: 16629417
Change-Id: I74417bf76ba80916ebc21b042c18b3467857733e
 2014-07-31 15:48:26 -07:00
Prashant Malani
b4dcc64fe6 Merge "Revert "Remove circular mask"" into klp-modular-dev 2014-07-24 15:36:14 +00:00
Chris Wren
65d630bad3 Merge "Add a log and statistics for notification expansion." into lmp-dev 2014-07-24 15:36:05 +00:00
Chris Wren
78403d7973 Add a log and statistics for notification expansion. 
Bug: 16618854
Change-Id: I501f396fa495e1e55a27d7d0b65aac66495418c1
 2014-07-30 14:47:13 +00:00
Nicolas Prevot
29762c3dfb Removing old tag TAG_FORWARDING_INTENT_FILTERS. 
By now, all devices should have updated, so we can remove the
old tag name.

Change-Id: Id0bc0e08f3979c5a2652c4eb8da9ff938b5d5bc4
 2014-07-30 14:06:22 +00:00
Robin Lee
4ee4e6e072 Merge "Don't turn off screen after wiping user profiles" into lmp-dev 2014-07-24 15:36:05 +00:00
PauloftheWest
64fe15846c Fixed a bug where Bluetooth was turned on with the drop-down in quick settings. 
Bug: 16547579

Change-Id: I3326aa1f4076d46dc0f8f87f14b44f097e684105
 2014-07-30 15:08:10 +00:00
Jorim Jaggi
90e0df291f Implement nice header transition when opening QS 
Bug: 15192264
Change-Id: Id7d67d6067882982e2ca195e257dfa1b73db2cf6
 2014-07-30 15:05:00 +00:00
Robin Lee
50c360790c Don't turn off screen after wiping user profiles 
The activity manager should know when to lock the screen. If an admin
does want this to happen then they should be able to run both commands
in succession.

Also rectifies some creative code styling in the same DPM method.

@bug 15558805

Change-Id: I8918184a4585aa8b061eb4a68edc2ec6805d8127
 2014-07-30 14:18:22 +00:00
Nicolas Prevot
4d4920ad81 Merge "Fixing a NullPointerException in isProfileOwnerApp." into lmp-dev 2014-07-24 15:36:05 +00:00
Nicolas Prevot
90af6d7365 Fixing a NullPointerException in isProfileOwnerApp. 
Fixing a NullPointerException in isProfileOwnerApp of DevicePolicyManager
if there is no profile owner.

BUG: 16673376
Change-Id: I912fcd38343d3c1893313e6335802d26014a2e9d
 2014-07-30 15:02:57 +01:00
Christoph Studer
dda48f1221 NoListener: Optimize RankingMap 
Cache ranks and interception bits instead of re-calculating
them every time they're accessed.

Change-Id: I2c6bbeaa01648d03ff8b3690b7f21cef4e2b9d97
 2014-07-30 13:48:04 +00:00
Christoph Studer
22f2ee567d SysUI: Reset background treatment when re-using Entries 
Bug: 16220667
Change-Id: I8fd2770fa5ea554728eb8cd70ce4a6171e28ece5
 2014-07-30 11:40:24 +00:00
Sander Alewijnse
6c9eee8747 Add warning in the disambig for specific launchers. 
For launcher that do not support managed profiles.
Also, ignore the intent after click on those launchers.

Change-Id: I3d5691952a9409755b7cde68a3caba98a3772665
 2014-07-30 10:27:44 +00:00
Guang Zhu
fa4b5466bb Merge "disable flashlight for monkey tests" into lmp-dev 2014-07-28 22:45:16 +00:00
Guang Zhu
2649f6b22a disable flashlight for monkey tests 
Change-Id: I81f459d41a780712f4c02e7ac7c0b51312e404be
 2014-07-30 00:52:58 -07:00
Jae Seo
6e62a1508c TIF: Use more consistent constant names 
Change-Id: Iee7cbbba621e4174c9fdaedc86d3830ca9f46cfe
 2014-07-30 11:46:41 +09:00
Alan Viverette
9e244b93c4 Merge "Revert "Update switch assets, fix SearchView asset 9-patch areas"" into lmp-dev 2014-07-28 22:45:16 +00:00