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

135926 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
42bff1ce2e am 3dc330af: am f7963fab: am c1bb79d9: am bb0b8449: Remove monetization image in edu guidelines. 
* commit '3dc330af6b590ebd3c6529e8b123f51cebb134e2':
  Remove monetization image in edu guidelines.
 2014-05-21 02:34:43 +00:00
Dirk Dougherty
3dc330af6b am f7963fab: am c1bb79d9: am bb0b8449: Remove monetization image in edu guidelines. 
* commit 'f7963fab0decb70b72b848fe3d7a14c5ed54ff95':
  Remove monetization image in edu guidelines.
 2014-05-21 02:29:04 +00:00
Dirk Dougherty
f7963fab0d am c1bb79d9: am bb0b8449: Remove monetization image in edu guidelines. 
* commit 'c1bb79d966c5fee256a349d8902c7abd362ddc39':
  Remove monetization image in edu guidelines.
 2014-05-21 02:25:09 +00:00
Dirk Dougherty
c1bb79d966 am bb0b8449: Remove monetization image in edu guidelines. 
* commit 'bb0b8449f80338a35768c9264e9c1e5eae54c7fa':
  Remove monetization image in edu guidelines.
 2014-05-21 02:20:16 +00:00
Dirk Dougherty
bb0b8449f8 Remove monetization image in edu guidelines. 
Change-Id: I2cea7a3507eda30ab185560304d64fc455ba19f7
 2014-05-20 19:10:26 -07:00
Wonsik Kim
193909da71 Merge "Change visibility of TvInputManager.Session.setSurface()" 2014-05-21 00:44:15 +00:00
Kristian Monsen
7a8e6e59ab Merge "Consider addAction(int action) to possibly be a bit mask" 2014-05-21 00:42:20 +00:00
Winson Chung
656c7b32ff Merge "Removing unnecessary proguard flag for removed info view." 2014-05-21 00:32:16 +00:00
Winson Chung
c637482a80 Removing unnecessary proguard flag for removed info view. 2014-05-21 00:31:43 +00:00
Lorenzo Colitti
6ec371cbdd Merge "Fix build." 2014-05-21 00:20:33 +00:00
Lorenzo Colitti
247675e5d9 Fix build. 
Change-Id: I5c09a406b6c43318cea600171b8dd25eeeffa673
 2014-05-20 17:17:21 -07:00
Griff Hazen
7e14285ff5 Merge "resolved conflicts for merge of cbe69ec1 to master" 2014-05-20 23:59:45 +00:00
Amith Yamasani
48f73ef141 Merge "Pass along the appOp param to broadcastIntent" 2014-05-20 23:58:45 +00:00
Amith Yamasani
0261b9b1cc Pass along the appOp param to broadcastIntent 
Forgot to pass that along in the original CL

Change-Id: I3aaa7de9cf5c73ab5cbff367e5889429e9ac2301
 2014-05-20 16:57:26 -07:00
Griff Hazen
d445fe7e54 resolved conflicts for merge of cbe69ec1 to master 
Change-Id: I183f94c726c9acb3de7d9369e315cc4ae1ff92d6
 2014-05-20 16:53:09 -07:00
Kristian Monsen
8d5f3fa645 Consider addAction(int action) to possibly be a bit mask 
bug=15092606

Change-Id: I885808b3f4d2337129d1660300be8e926f8a8425
 2014-05-20 16:44:14 -07:00
Andres Morales
94a17b5f18 Merge "Revert "Adding INfcUnlockSettings and NfcUnlock interface class."" 2014-05-20 23:40:37 +00:00
Chris Craik
47a7d61e70 Merge "Clean up Outline API, method on drawable" 2014-05-20 23:27:21 +00:00
Winson Chung
7bb188521c Merge "Wrapping console logs." 2014-05-20 23:25:42 +00:00
Winson Chung
10f8139d3b Wrapping console logs. 2014-05-20 16:21:31 -07:00
Griff Hazen
cbe69ec18d am 7ea18e1c: Add wearable notification extensions to frameworks/base. 
* commit '7ea18e1c92ab84d1a0d00087e6e3784646661fe8':
  Add wearable notification extensions to frameworks/base.
 2014-05-20 23:21:01 +00:00
Jim Miller
430259a1d8 Merge "Update FingerprintManager API after discussions." 2014-05-20 23:18:48 +00:00
Lorenzo Colitti
00592c2700 Merge "Move IP config from WifiConfiguration to IpConfiguration." 2014-05-20 23:15:50 +00:00
Maurice Lam
92dfff4bc8 Merge "Disable swipe-to-reveal nav bar / status bar during setup" 2014-05-20 23:15:42 +00:00
Jim Miller
90b6b63d1d Merge "Fix Keyguard PIN error message for N < 4." 2014-05-20 23:12:07 +00:00
Yuncheol Heo
cd47ecb690 Merge "Fix the wrong conversion of byte to int." 2014-05-20 22:53:13 +00:00
Jaewan Kim
6346155c5a Move IP config from WifiConfiguration to IpConfiguration. 
This is so that Ethernet can use it in the future.

Bug: 7606609
Bug: 8687763

Change-Id: I5d1189682b13f1088848809604690648d8d9ecca
 2014-05-20 15:24:10 -07:00
Amith Yamasani
863ddcc7ac Merge "Per-user telephony restrictions" 2014-05-20 22:20:06 +00:00
Julia Reynolds
37f4e44ae6 Merge "Add Device/Profile Owner gated apis for setting/getting blocked packages." 2014-05-20 22:19:02 +00:00
Amith Yamasani
9f6c25f57e Per-user telephony restrictions 
Allow profile owners or administrators of restricted profiles
to restrict access to telephony features such as calling and
texting for a user.

Change-Id: I89f97608c07c647ad8a7b43fef9d1e6bc4a84e95
 2014-05-20 15:13:28 -07:00
Julia Reynolds
4d40452154 Merge "Allow device/profile owners to update settings." 2014-05-20 22:10:46 +00:00
Yuhao Zheng
0c62e8eb30 Merge "Fix a boot failure due to Wifi / Wifi Passpoint" 2014-05-20 22:08:32 +00:00
Alan Viverette
3dfd5bae84 Merge "Various API review fixes to resources and drawables" 2014-05-20 22:06:12 +00:00
Julia Reynolds
966881e895 Add Device/Profile Owner gated apis for setting/getting blocked packages. 
DMAgent currently needs to live in /system/priv-app in order to
(among other things) set and get blocked packages. These APIs will
get us closer to being able to move DMAgent out of priv-app.
Bug: 14945334

Change-Id: I108e2013c67409dca554acf78e3a710745900706
 2014-05-20 17:59:58 -04:00
Julia Reynolds
da55165321 Allow device/profile owners to update settings. 
Device owners can update Settings.Secure and Settings.Global settings.
Profile owners can update Settings.Secure settings.

DMAgent currently needs to live in /system/priv-app in order to
(among other things) update global and secure settings. This change will
get us closer to being able to move DMAgent out of priv-app.
Bug: 14965414

Change-Id: If2cc3a56de91bffde33b838ab8ecea2c32412803
 2014-05-20 17:49:45 -04:00
Winson Chung
48dfae92d2 Merge "Removing the info pane." 2014-05-20 21:42:52 +00:00
Eric Laurent
c0e439f1b7 Merge "AudioSystem: add new audio device definitions" 2014-05-20 21:39:23 +00:00
Winson Chung
53dd1f7ffc Merge "Fixing transition to/from Recents with full screen apps." 2014-05-20 21:36:28 +00:00
Winson Chung
863db8a4e7 Removing the info pane. 
Change-Id: I5486291144cbcb1b31a7e5b8a234e5ef7cf85325
 2014-05-20 14:33:04 -07:00
Jorim Jaggi
112e5147f6 Merge "Fix invisible notification backgrounds." 2014-05-20 21:29:00 +00:00
Winson Chung
ae08441649 Fixing transition to/from Recents with full screen apps. 
Change-Id: I2f400b6736581a37d38a75ee7194fc7cb6438460
 2014-05-20 14:20:11 -07:00
Jorim Jaggi
3c3c3fc38c Fix invisible notification backgrounds. 
Bug: 15094262
Change-Id: I37eeb03a6ebb595da6793cfc95aa159662ab3990
 2014-05-20 23:17:44 +02:00
Yuhao Zheng
8a476edccd Fix a boot failure due to Wifi / Wifi Passpoint 
Bug: 15060373
Change-Id: Ie72fd2e4b855c46a8f9ed12deb8b07fd0c29f522
 2014-05-20 14:06:49 -07:00
RoboErik
23a42810e3 Merge "Add getMediaSession to RCC" 2014-05-20 21:02:18 +00:00
RoboErik
5f31737c68 Add getMediaSession to RCC 
This is to make integration with Media notifications easier.

Change-Id: I783ae5c2620ff0e11bf5584604b9c9623850e2f0
 2014-05-20 14:00:53 -07:00
Griff Hazen
7ea18e1c92 Add wearable notification extensions to frameworks/base. 
Change-Id: Ic312cec7dc11e637002ff2be3975940a93a6babf
 2014-05-20 13:50:06 -07:00
Jeff Brown
b86b1027a3 am 9777fdb7: am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown" 
* commit '9777fdb7af696ca15906d03ad8aa7a3d8d51e4b3':
  Fix NullException in QwertyKeyListener.KeyDown
 2014-05-20 20:47:29 +00:00
Jeff Brown
9777fdb7af am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown" 
* commit 'b0a7f84b6de20edc6337163a4a07e3c524991ddb':
  Fix NullException in QwertyKeyListener.KeyDown
 2014-05-20 20:44:21 +00:00
Jeff Brown
b0a7f84b6d am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown" 
* commit '63bf04d88bcc00876c30c9f2848da8c44b42185b':
  Fix NullException in QwertyKeyListener.KeyDown
 2014-05-20 20:40:20 +00:00
Winson Chung
15f3e28819 Merge "Should not be closing system dialogs when Recents is hidden. (Bug 15109551)" 2014-05-20 20:37:58 +00:00