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

190488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Gampe
d3e8ddfe01 am 5eedef96: am fcda22b1: Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev 
* commit '5eedef96d9408cdb78b5a28878bf1013cc11f8d3':
  am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp
 2015-04-30 18:29:35 +00:00
Andreas Gampe
5eedef96d9 am fcda22b1: Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev 
* commit 'fcda22b1fe33370922a53d6562aa15366818bd45':
  am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp
 2015-04-30 18:05:53 +00:00
Robin Lee
521fea49c3 am 644ff2f9: am ef25597a: SystemUI strings: prospective VPN strings for apps 
* commit '644ff2f9d0dac0c34786578c0d0b79729a5c2664':
  SystemUI strings: prospective VPN strings for apps
 2015-04-30 18:05:13 +00:00
Andreas Gampe
fcda22b1fe Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev 2015-04-30 17:53:51 +00:00
Robin Lee
644ff2f9d0 am ef25597a: SystemUI strings: prospective VPN strings for apps 
* commit 'ef25597acfb15b1f4f501fbdcbafd1b6fa8cc9c6':
  SystemUI strings: prospective VPN strings for apps
 2015-04-30 17:51:12 +00:00
Robin Lee
ef25597acf SystemUI strings: prospective VPN strings for apps 
Bug: 20516964
Change-Id: Ifaeb388896145fd71ff9aa9fab6e2b04af807631
(cherry picked from commit 63539bd5fac53d90adff35df340562a1926d610e)
 2015-04-30 17:38:29 +00:00
Jean-Michel Trivi
c8efc4490d am 3d42d238: am f764d219: Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev 
* commit '3d42d2380f5af53ce299610e27f40a8d88930c89':
  AudioService receives callback for dynamic policy mix state changes
 2015-04-30 17:14:30 +00:00
Jean-Michel Trivi
3d42d2380f am f764d219: Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev 
* commit 'f764d219f0faf82219600761c8d0562623b8f054':
  AudioService receives callback for dynamic policy mix state changes
 2015-04-30 16:57:03 +00:00
Jean-Michel Trivi
f764d219f0 Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev 2015-04-30 16:43:19 +00:00
Chris Craik
b86f0bc3a7 am 75c4e3e4: am ed375f26: Merge "Fix rendernode flag logging" into mnc-dev 
* commit '75c4e3e4d58f310174bbc24e6b2fb058773f8f31':
  Fix rendernode flag logging
 2015-04-30 16:39:15 +00:00
Alex Klyubin
588fffc23e am 84c64efe: am 403ac2d6: Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev 
* commit '84c64efef90818888dca12f7650a632b70438a8f':
  AndroidKeyStore keys should not be handled by Bouncy Castle.
 2015-04-30 16:39:11 +00:00
Chris Craik
75c4e3e4d5 am ed375f26: Merge "Fix rendernode flag logging" into mnc-dev 
* commit 'ed375f269bab6fb9f0dc224defae8099b2b1a7f7':
  Fix rendernode flag logging
 2015-04-30 16:25:39 +00:00
Alex Klyubin
84c64efef9 am 403ac2d6: Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev 
* commit '403ac2d64f7ad53ecf9ccd713951cf151ea2f2bc':
  AndroidKeyStore keys should not be handled by Bouncy Castle.
 2015-04-30 16:25:33 +00:00
Alan Viverette
68999a740c am 19b9f8ef: am 8310f87d: Merge "ActionBar SearchView\'s default hint shouldn\'t override SearchableInfo" into mnc-dev 
* commit '19b9f8ef3eaf392db0a993ae0d5a7a84e9d6c60f':
  ActionBar SearchView's default hint shouldn't override SearchableInfo
 2015-04-30 16:21:57 +00:00
Chris Craik
ed375f269b Merge "Fix rendernode flag logging" into mnc-dev 2015-04-30 16:19:33 +00:00
John Spurlock
0f4c6a8bdf am 1642e354: am 8f72b403: Merge "Zen: New event condition data model." into mnc-dev 
* commit '1642e354ed10bc606f403ac6f529392f3f25dd2d':
  Zen: New event condition data model.
 2015-04-30 16:16:13 +00:00
Ronghua Wu
5054f90617 am c98070a4: am 1b12db9e: Merge "media: set codec exception reason." into mnc-dev 
* commit 'c98070a46168c14e54899bfca69889154e3a565d':
  media: set codec exception reason.
 2015-04-30 16:16:08 +00:00
Abodunrinwa Toki
74f745fe88 am d0363bc3: am 5793f22e: Merge "Use theme attributes for FloatingToolbar colors." into mnc-dev 
* commit 'd0363bc3948894cc79f32719e04d66496572fe31':
  Use theme attributes for FloatingToolbar colors.
 2015-04-30 16:15:45 +00:00
Narayan Kamath
69a0f5df49 am cf9f16d2: am 144b0bb6: Merge "Fix incorrect javadoc for Uri.getQueryParameter." into mnc-dev 
* commit 'cf9f16d2b0900fdf9125f12f9c6c086123e7657d':
  Fix incorrect javadoc for Uri.getQueryParameter.
 2015-04-30 16:15:38 +00:00
Chris Craik
031e69ff81 Fix rendernode flag logging 
Change-Id: I978c54ab26ef6dc3f6caef8604ac77a883b8e913
 2015-04-30 09:12:44 -07:00
Alex Klyubin
403ac2d64f Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev 2015-04-30 16:12:33 +00:00
Alan Viverette
19b9f8ef3e am 8310f87d: Merge "ActionBar SearchView\'s default hint shouldn\'t override SearchableInfo" into mnc-dev 
* commit '8310f87d96791e8b864df5e821fe65273c2dd874':
  ActionBar SearchView's default hint shouldn't override SearchableInfo
 2015-04-30 16:07:36 +00:00
Alan Viverette
8310f87d96 Merge "ActionBar SearchView's default hint shouldn't override SearchableInfo" into mnc-dev 2015-04-30 15:59:21 +00:00
John Spurlock
1642e354ed am 8f72b403: Merge "Zen: New event condition data model." into mnc-dev 
* commit '8f72b4037022c4f860caafa296e2ac309bde177f':
  Zen: New event condition data model.
 2015-04-30 15:58:27 +00:00
Ronghua Wu
c98070a461 am 1b12db9e: Merge "media: set codec exception reason." into mnc-dev 
* commit '1b12db9e6225171da87ed9586daeabf76b53c05a':
  media: set codec exception reason.
 2015-04-30 15:58:22 +00:00
John Spurlock
8f72b40370 Merge "Zen: New event condition data model." into mnc-dev 2015-04-30 15:45:55 +00:00
John Spurlock
d60258f2d3 Zen: New event condition data model. 
- Add system condition provider for calendar event-based rules.
 - Add stub condition provider for handling event conditions.
 - Add various shared items to support new settings subpage.

Bug: 20064962
Change-Id: I6f5afe0f1444976f0dc6807048e0580e8a28070e
 2015-04-30 11:42:11 -04:00
Ronghua Wu
1b12db9e62 Merge "media: set codec exception reason." into mnc-dev 2015-04-30 15:40:36 +00:00
Zoltan Szatmary-Ban
2aab6de5a8 am 795ec677: am 780a9b9e: Merge "Fix potential NPE on devices without DPMS" into mnc-dev 
* commit '795ec67721c565ffa15a4c283428227c954e7a5f':
  Fix potential NPE on devices without DPMS
 2015-04-30 15:20:27 +00:00
Benjamin Franz
f225e6c6af am 550ab61c: am dc4ad271: Merge "Add package name extra to PackageInstaller callback" into mnc-dev 
* commit '550ab61ca54cc0366842263563f8061d56931fcd':
  Add package name extra to PackageInstaller callback
 2015-04-30 15:20:19 +00:00
Wei Wang
fb63b6820d am 46fa9a96: am 05a419ae: Merge "Temp workaround to track max beacons." into mnc-dev 
* commit '46fa9a964f5897d8f125f5ad2e25080043810233':
  Temp workaround to track max beacons.
 2015-04-30 15:20:05 +00:00
Shawn Willden
dad123a0e5 am 2ac378b3: am 7230bdf2: Merge "Add missing error codes from keymaster_defs.h." into mnc-dev 
* commit '2ac378b3bb0d81e418239ef170bb9cb6159ddcae':
  Add missing error codes from keymaster_defs.h.
 2015-04-30 15:19:50 +00:00
Jeff Sharkey
a54020c7ae am 508c9fec: am 21df222f: Merge "New "frozen" state during app move/upgrade." into mnc-dev 
* commit '508c9fecb6644a533ae63ff52596f484b1fe2806':
  New "frozen" state during app move/upgrade.
 2015-04-30 15:19:41 +00:00
John Spurlock
df7f02b6e0 am ad61b833: Merge "Fix no vibration during shutdown." 
* commit 'ad61b8336aa9627a6ae19580bbdc370dc8bd6810':
  Fix no vibration during shutdown.
 2015-04-30 12:47:20 +00:00
Abodunrinwa Toki
d0363bc394 am 5793f22e: Merge "Use theme attributes for FloatingToolbar colors." into mnc-dev 
* commit '5793f22e68f74522dfe5780b96b22d18617467be':
  Use theme attributes for FloatingToolbar colors.
 2015-04-30 12:33:04 +00:00
John Spurlock
ad61b8336a Merge "Fix no vibration during shutdown." 2015-04-30 12:22:41 +00:00
Abodunrinwa Toki
5793f22e68 Merge "Use theme attributes for FloatingToolbar colors." into mnc-dev 2015-04-30 12:18:51 +00:00
Narayan Kamath
cf9f16d2b0 am 144b0bb6: Merge "Fix incorrect javadoc for Uri.getQueryParameter." into mnc-dev 
* commit '144b0bb6053010f0e0da65cee89401b87633bbff':
  Fix incorrect javadoc for Uri.getQueryParameter.
 2015-04-30 11:35:58 +00:00
Narayan Kamath
144b0bb605 Merge "Fix incorrect javadoc for Uri.getQueryParameter." into mnc-dev 2015-04-30 11:25:37 +00:00
Narayan Kamath
b0f3d9ea6e Fix incorrect javadoc for Uri.getQueryParameter. 
This first went out with Jelly Bean and not ICS.

bug: https://code.google.com/p/android/issues/detail?id=61651

(cherry picked from commit 4356c95354d28b8ceb1b04e97c53c2ba3b3faa93)

Change-Id: I5b96bcb20aa3a1d227dd5b00926af077276fc666
 2015-04-30 12:23:19 +01:00
Zoltan Szatmary-Ban
795ec67721 am 780a9b9e: Merge "Fix potential NPE on devices without DPMS" into mnc-dev 
* commit '780a9b9e12228402144f5c88917875c9da226cbf':
  Fix potential NPE on devices without DPMS
 2015-04-30 09:59:18 +00:00
Zoltan Szatmary-Ban
780a9b9e12 Merge "Fix potential NPE on devices without DPMS" into mnc-dev 2015-04-30 09:48:36 +00:00
Benjamin Franz
550ab61ca5 am dc4ad271: Merge "Add package name extra to PackageInstaller callback" into mnc-dev 
* commit 'dc4ad271f931eca48ab8ef22ef76db740d179d99':
  Add package name extra to PackageInstaller callback
 2015-04-30 09:40:39 +00:00
Zoltan Szatmary-Ban
cccbe885b9 Fix potential NPE on devices without DPMS 
Bug: 20563108
Change-Id: Ie2bda65c834ddad9db8753f7616c2754072551cd
 2015-04-30 10:38:24 +01:00
Benjamin Franz
dc4ad271f9 Merge "Add package name extra to PackageInstaller callback" into mnc-dev 2015-04-30 08:33:47 +00:00
Wei Wang
46fa9a964f am 05a419ae: Merge "Temp workaround to track max beacons." into mnc-dev 
* commit '05a419aed54da30999a3831d8da6e2e72f85bd40':
  Temp workaround to track max beacons.
 2015-04-30 07:13:18 +00:00
Wei Wang
05a419aed5 Merge "Temp workaround to track max beacons." into mnc-dev 2015-04-30 07:08:43 +00:00
Wei Wang
fc9f2d71a6 Temp workaround to track max beacons. 
Change-Id: Ia65a7a0ec98d0181cf62db343e00c4a0b01c32d8
 2015-04-30 00:07:53 -07:00
Shawn Willden
2ac378b3bb am 7230bdf2: Merge "Add missing error codes from keymaster_defs.h." into mnc-dev 
* commit '7230bdf23bf905a60ac2c209f04fcf83264fec56':
  Add missing error codes from keymaster_defs.h.
 2015-04-30 05:18:27 +00:00
Jeff Sharkey
508c9fecb6 am 21df222f: Merge "New "frozen" state during app move/upgrade." into mnc-dev 
* commit '21df222fa8f3fdeb38dc7d59b6bcba15971d340b':
  New "frozen" state during app move/upgrade.
 2015-04-30 05:18:23 +00:00