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

232456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
ea2a9ee0b6 Merge "Use the right ClassLoader when restoring." 2016-02-06 00:15:41 +00:00
Jeff Sharkey
ba9a4b397f Use the right ClassLoader when restoring. 
If we're restoring after a background process death, the Parcelable
creator cache is cold, and since we're handing in a null ClassLoader
the best the platform can do is try the default ClassLoader which
knows nothing about the running app.

That's why ClassLoaderCreator exists, so use it to snag the relevant
ClassLoader and pass it along.

Bug: 26075620
Change-Id: I6fd977d6178dd0f5f9c465597f5806a08097ac7c
 2016-02-05 17:13:21 -07:00
John Reck
d1ddcf19bb resolve merge conflicts of 9ea5295597 to master. 
Change-Id: I68b883e8a1bb17abd4cf151d057dd07e53a80f50
 2016-02-05 15:59:55 -08:00
John Reck
9ea5295597 Merge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case" 
am: 857b65657d

* commit '857b65657d453801e9b73f998043603456dac813':
  libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case
 2016-02-05 23:52:12 +00:00
John Reck
857b65657d Merge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case" 2016-02-05 23:38:10 +00:00
Chong Zhang
af78708e98 Merge "Check wallpaper visibility to determine if wallpaper is obscuring apps." 2016-02-05 23:32:56 +00:00
Jeff Sharkey
bb17d092fd Merge "Tweaks to file:// Uri StrictMode checks." 2016-02-05 23:21:30 +00:00
Jeff Sharkey
37355a9f5d Tweaks to file:// Uri StrictMode checks. 
Whitelist two more legacy intent actions, and don't enforce the
StrictMode checks when resolving intents that might be coming from
legacy apps.  Newer apps would have already been yelled at directly
before getting to the resolver.

Bug: 26976516, 26977622
Change-Id: Ibf72a361ed68c52cfaac16c32ab40e79005a42e7
 2016-02-05 16:19:13 -07:00
Abhijith Shastry
8c3b70bb8c Merge "Carrier config to support overriding block suppress duration after emergency contact." 2016-02-05 23:08:28 +00:00
Abhijith Shastry
d48935879a Carrier config to support overriding block suppress duration after emergency contact. 
BUG: 26989170
Change-Id: I6d8f13dd4f2b69730826cc8440a22c7154255ac8
 2016-02-05 15:06:56 -08:00
Chong Zhang
66bf071d11 Check wallpaper visibility to determine if wallpaper is obscuring apps. 
bug: 26948569
Change-Id: I710893ee086dce441cb5e2744fc721d3e1a2fd8a
 2016-02-05 14:42:36 -08:00
Alex Klyubin
bd0d4265bb Merge "Fix typo in KeyInfo Javadoc." am: e8fbc20e12 
am: b21416e287

* commit 'b21416e2875973706d8b922428225194d9625875':
  Fix typo in KeyInfo Javadoc.
 2016-02-05 22:37:31 +00:00
Alex Klyubin
b21416e287 Merge "Fix typo in KeyInfo Javadoc." 
am: e8fbc20e12

* commit 'e8fbc20e12da685acddffc01c41ccf134f051ce9':
  Fix typo in KeyInfo Javadoc.
 2016-02-05 22:33:09 +00:00
Jean-Michel Trivi
e35bde5291 Merge "Dynamic audio policies: fix AttributeMatchCriterion addition in mix" 2016-02-05 22:27:26 +00:00
Alex Klyubin
e8fbc20e12 Merge "Fix typo in KeyInfo Javadoc." 2016-02-05 22:26:56 +00:00
Steven Dao
6ce4a46a96 Merge "Fix GridView isHeading computation" 2016-02-05 22:23:54 +00:00
Tyler Gunn
65b266d956 Merge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev 
am: 6c4aac0bde

* commit '6c4aac0bdee2678818f577490c4acfdeeba81c59':
  IMS: Constants For Audio Quality, Supp. Services
 2016-02-05 22:18:26 +00:00
Alex Klyubin
d9dded5a46 Fix typo in KeyInfo Javadoc. 
Change-Id: I801005a93aee71b93b3d6cf3f7c38361493ff203
 2016-02-05 14:18:19 -08:00
Tyler Gunn
6c4aac0bde Merge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev 2016-02-05 22:13:32 +00:00
Steven Dao
061b16ff88 Fix GridView isHeading computation 
- Same issue that was previously in the ListView

Change-Id: I3a3105b46bdadc43ea679b4d29d0719a67c291bc
 2016-02-05 13:51:55 -08:00
Christian Poetzsch
9a878a646f hwui: set buffer destroyed swap mode explicitly 
Not using EGL_SWAP_BEHAVIOR_PRESERVED_BIT as config attribute for
eglChooseConfig doesn't automatically mean the swap behavior is buffer
destroyed. This is driver implementation specific and on some hw this
can still be buffer preserved. Make sure it is buffer destroyed by
explicitly setting it for every new surface when requested.

Change-Id: Ie2c7c89b0d20e35832b488c6263bb4d9dd844a75
Signed-off-by: Christian Poetzsch <christian.potzsch@imgtec.com>
 2016-02-05 13:51:37 -08:00
John Reck
0b69467d42 Merge "Add a debug assert to track down infinite loop" 2016-02-05 21:40:16 +00:00
Doris Liu
469a828ac7 Merge "Ref count the nodes in VectorDrawable" 2016-02-05 21:31:24 +00:00
Doris Liu
43a5591c8d Merge "Revert "Revert "VectorDrawable native rendering - Step 4 of MANY""" 2016-02-05 21:31:06 +00:00
Makoto Onuki
bb66a0edfe Merge "Prevent NPE in ContactsContract" 2016-02-05 21:30:39 +00:00
Makoto Onuki
da072b3e38 Prevent NPE in ContactsContract 
Bug 26730982

Change-Id: I36fdfffba79e0696175edd42bb131f92cba47499
 2016-02-05 13:28:45 -08:00
Peng Xu
2a2ec8640e Merge "Fix potential crash when getSensorList returns error" 2016-02-05 21:07:23 +00:00
Jason Monk
2cd860eccf Merge "Fix some battery icon issues" 2016-02-05 21:07:15 +00:00
Peng Xu
a08c9f52db Fix potential crash when getSensorList returns error 
bug: b/19937981

Change-Id: Ibfb8c625609923b4e60fa73685dbeb10944ab2b9
 2016-02-05 13:03:57 -08:00
John Reck
83c9b5bf63 Add a debug assert to track down infinite loop 
Bug: 26980851
Change-Id: I326983ab367782048311b6cf06d800f72837e38e
 2016-02-05 13:03:47 -08:00
Jeff Sharkey
e5a20ce397 Merge "Prepare user storage just before using it." 2016-02-05 21:01:22 +00:00
Jason Monk
5c404c8dc6 Fix some battery icon issues 
Bug: 26818515
Change-Id: I93f3fb19f82ba8c169b2d0c8d43f1c28b2e71ae9
 2016-02-05 15:54:10 -05:00
Jason Monk
73ebd130eb Merge "Update QS defaults list" 2016-02-05 20:03:07 +00:00
Jason Monk
6da39af35d Merge "Have nav bar handle density changes" 2016-02-05 20:01:37 +00:00
Jason Monk
093b3f1ba0 Merge "Fix external status bar icon sizes" 2016-02-05 19:59:43 +00:00
Chris Wren
fab2490279 Merge "move assistant to system API" 2016-02-05 19:57:40 +00:00
Chris Wren
10c63d8a12 move assistant to system API 
Bug: 26693581
Change-Id: I7e29b8521e2c33683b8032e63da734cfde1dfcc9
 2016-02-05 14:55:35 -05:00
Jason Monk
e24194f079 Update QS defaults list 
Also allow custom tiles to be in the default list.

Bug: 26425051
Change-Id: I88af8b251dda333f1392e9959c8505e85f4cbafa
 2016-02-05 14:55:05 -05:00
Makoto Onuki
911db2e19a Merge "Remove com.google.android.syncadapters.contacts from exception list" 2016-02-05 19:51:18 +00:00
Makoto Onuki
e798ba1033 Remove com.google.android.syncadapters.contacts from exception list 
Bug 26902400
Bug 26481405

Change-Id: I3b4d0217ee033f727074f68ebe6a1c1461509d04
 2016-02-05 11:45:02 -08:00
Amith Yamasani
046cc21b75 Merge "Rewrite app standby stats" 2016-02-05 19:41:04 +00:00
Amith Yamasani
a93542f9d3 Rewrite app standby stats 
Don't mix up with usage stats. Keep a separate db and history
based on elapsed time and screen on time.

Unit tests for AppIdleHistory class.

Bug: 26989006
Change-Id: If343785b46da1db67f7c1c1263854c2732a232c6
 2016-02-05 11:38:29 -08:00
Abhijith Shastry
89c6073cd0 Merge "Update javadoc for BlockedNumberContract." 2016-02-05 19:36:07 +00:00
Jason Monk
6d6672ffd1 Fix external status bar icon sizes 
Bug: 26850030
Change-Id: I6de129aa1b6c73b0c1ad5373e59c2ad398b2dc7a
 2016-02-05 14:35:34 -05:00
Selim Cinek
2a7fc72ac4 Merge "Adapted the notification header colors to spec" 2016-02-05 19:22:01 +00:00
Jean-Michel Trivi
fee832a097 Dynamic audio policies: fix AttributeMatchCriterion addition in mix 
When adding an AttributeMatchCriterion for a mix, build the instance
  with the constructor that matches the rule.

Bug 26798796

Change-Id: I130f4bdab51644685413d294096d35d9685ea5eb
 2016-02-05 11:15:42 -08:00
Doris Liu
ef062ebd20 Ref count the nodes in VectorDrawable 
Also added API check so that for pre-N we ignore invalid VD animation,
in order to avoid breaking old apps.

Bug: 26975469
Bug: 26949340
Change-Id: I498539ad6a05de3d886e7dcdc8a167e78333ab11
 2016-02-05 11:12:25 -08:00
Wale Ogunwale
39d1b5b0f7 Merge "Exclude tasks manipulated before user setup is complete from Recents" 2016-02-05 19:04:56 +00:00
Jeremy Klein
89ff40f3fd Merge "Fix a small issue with the BT Tether callback value." 2016-02-05 18:50:58 +00:00
Selim Cinek
aef485a32a Adapted the notification header colors to spec 
Change-Id: Ifa9483a5e71f32be2df14912982076d7bf2a6e9a
 2016-02-05 10:43:00 -08:00