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

89324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
5f61e9b4ef am ed98abec: am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp 
* commit 'ed98abecad359ab1765ac1f698c8ba06dbd00745':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 16:36:28 +00:00
Deepanshu Gupta
520f585bc6 am 2cbe100a: am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE] 
* commit '2cbe100a9bc6d2b3bf828432a1527f0ac239e575':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 16:36:25 +00:00
Deepanshu Gupta
2c167d0f6a am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] 
* commit '632c9e2dabc44b24f04c3418e4a3540b22db792b':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 16:36:22 +00:00
Deepanshu Gupta
ed98abecad am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp 
* commit '8a70bcef5a724906e3c35c58cb2266ee9c9e1b78':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 16:31:28 +00:00
Deepanshu Gupta
2cbe100a9b am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE] 
* commit '40fea8b1bf689933e63941b5fa5e3379f82c88b5':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 16:31:23 +00:00
Deepanshu Gupta
632c9e2dab am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] 
* commit '065ce2e8b3e11ff8bb1699748edbd23d272bc8a6':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 16:31:20 +00:00
Deepanshu Gupta
9c00e6739c am 2fb139e0: resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev 
* commit '2fb139e02c1e9d2d7c92acf813445a063e73d94f':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 16:31:05 +00:00
Deepanshu Gupta
1103ece28c am f20c9c66: am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE] 
* commit 'f20c9c660edcce0fe90ba5f8464f726dcd51229e':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 02:02:56 +00:00
Deepanshu Gupta
42556c394b am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit '3990ec3490cc43a2690163f2a973b5ac6c4bdc46':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 02:02:54 +00:00
Deepanshu Gupta
202800b12d am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit '4d69ca223b268d4ed93baf9d3c354e1df79d55ce':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 02:02:50 +00:00
Deepanshu Gupta
2fb139e02c resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev 
Change-Id: Id8cb5e2e9d0c41bdaf767563ebd6e3951ae68a3c
 2014-05-12 19:01:41 -07:00
Deepanshu Gupta
8a70bcef5a resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp 
Change-Id: I6bafdb9c6a8dfc6f55a4d9adf67f447661137eb8
 2014-05-12 18:57:34 -07:00
Deepanshu Gupta
f20c9c660e am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE] 
* commit '06c4f23d737082717f37f5f3583d9c12f4b64bf2':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 01:57:25 +00:00
Deepanshu Gupta
3990ec3490 am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit 'cdb87d8d83e8a76a4cf78d24d5c49ee8548eba1f':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 01:57:22 +00:00
Deepanshu Gupta
4d69ca223b am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit 'edae4e69512a7c9df1076fde70de83e15053a30a':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 01:57:18 +00:00
Deepanshu Gupta
40fea8b1bf am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE] 
* commit '4b5da86d04200ba278b62ff99da91e212b87e9af':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 01:52:32 +00:00
Deepanshu Gupta
065ce2e8b3 am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] 
* commit '5c166c9c04b6ea9d4955830e7ba277be71f17a6f':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 01:52:28 +00:00
Deepanshu Gupta
9f2f5e776a am 2d82586b: Fix CalendarView to show the right labels. [DO NOT MERGE] 
* commit '2d82586b96593b1b3b5280d77d5ae9a09df9d1fd':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 01:52:25 +00:00
Deepanshu Gupta
06c4f23d73 am 64dc0380: Fix layoutlib [DO NOT MERGE] 
* commit '64dc0380127047ffcf135b6848c9150aa8dbed85':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 01:52:21 +00:00
Deepanshu Gupta
cdb87d8d83 am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit 'a59c27dd6674a31c875b0baa86519caec628ca2d':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 01:52:18 +00:00
Deepanshu Gupta
edae4e6951 am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit '8a39c3afb29f2540b05319042e758dd4d5f73a1e':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 01:52:15 +00:00
Deepanshu Gupta
5a7b3b65b6 Remove references to non-std Java classes. [DO NOT MERGE] 
Do not add the non-standard Java classes. Updates the references to all
non-standard classes to new classes in
com.android.tools.layoulib.create package. This also treats
java.lang.AutoCloseable which is part of Java 7 similarly so that we can
still run on Java 6.

This also adapts the cherrypick for this branch by updating references
to the non-standard Java classes present in this branch. This also
includes the following change that includes some changes that the
original cherrypick missed.
Change-Id: I76c87c74ee088778b37d1a7a7d531e0fde5c758f
commit: 1ed75bde09275c9f2bd1f81830e381ea864ac7f5

Change-Id: Iac5b272652e2780c9bb72d19f415d150948ca589
(cherry picked from 80c668f2a076e91d887dbf77776cd503ff88b0b4)
 2014-05-06 13:55:56 -07:00
Deepanshu Gupta
4b5da86d04 Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE] 
Issue: https://code.google.com/p/android/issues/detail?id=59732

Change-Id: I281b3fdad88c591281a3645592c84f3e2cb61d09
(cherry picked from commit 6335590aa8997944cc7fb358a315dbb9b789f87f)
 2014-05-05 18:42:28 -07:00
Deepanshu Gupta
5c166c9c04 Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] 
Issue: https://code.google.com/p/android/issues/detail?id=60993

Change-Id: Ia43ed40b42c79f67dcd5809b827d4fecbc823c25
(cherry picked from commit 11ee746dc5e77f4f33aac45ac9e344444223012d)
 2014-05-05 18:33:08 -07:00
Deepanshu Gupta
2d82586b96 Fix CalendarView to show the right labels. [DO NOT MERGE] 
Change-Id: I95431f1054678d4192bd1621c1f69b29268f55e9
(cherry picked from commit 44bcd64e5b9fd211dd56b0598693a0559f65dc1a)
 2014-05-05 18:32:04 -07:00
Deepanshu Gupta
64dc038012 Fix layoutlib [DO NOT MERGE] 
Fix a NPE.

The cherry-pick differs slightly from the original to remove changes not
relevant to the current branch.

Bug: 11140701
Change-Id: Id92fc5359acf6dde1bcdbc781aaf637fdb6eecbf
(cherry-picked from 87be67f91719234cbd381ff0242b5efc8b6aa257)
 2014-05-05 18:23:15 -07:00
Deepanshu Gupta
a59c27dd66 Fix ClassCastException when rendering ListView [DO NOT MERGE] 
Bug: b.android.com/59300
Change-Id: Ia350adb3308daa8170bff755302760790163c811
(cherry picked from commit 7b5d54f05be61a7ab40021644a91c466e2897627)
 2014-05-05 18:21:41 -07:00
Deepanshu Gupta
8a39c3afb2 Add orientation to configuration for layoutlib. [DO NOT MERGE] 
Update the configuration with the device orientation before rendering.

Change-Id: Icd40901204fd13f90b18353e53a15e25e5b2176c
(cherry picked from commit d4875e19f5b7c69226783b0a6590831466159f84)
 2014-05-05 18:17:13 -07:00
Kenny Root
4a62a6dce9 am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '451ed5f077b9f95deae809ae620bc210c253b922':
  Use hidden API to validate APK chains
 2014-04-18 22:14:14 +00:00
Kenny Root
451ed5f077 am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '3ecaa88d83d04a0fd55b494829badbb41016f5a1':
  Use hidden API to validate APK chains
 2014-04-18 21:33:04 +00:00
Kenny Root
3ecaa88d83 am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit 'ecb013dbff5e33b95c49015fa375579e055911ae':
  Use hidden API to validate APK chains
 2014-04-18 18:14:32 +00:00
Kenny Root
ecb013dbff Merge "Use hidden API to validate APK chains" into jb-dev 2014-04-18 17:12:40 +00:00
Kenny Root
16c6b177ee Use hidden API to validate APK chains 
Bug: 13678484
Change-Id: I28dedab74b0e24d47ab9f2190298156c909e9d54
 2014-04-17 14:03:33 -07:00
Robert Greenwalt
4bc58bd255 am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit 'c0d94e7ac6353757b7fa4d7f6fce75c5719c7e6e':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:47:49 +00:00
Robert Greenwalt
c0d94e7ac6 am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit 'f52d1a56af8cc769c1019fbb0d8b7a2254fcc01b':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:42:49 +00:00
Robert Greenwalt
f52d1a56af am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit 'fe38ff8d36c4fa2e18f4c786692eeea5ebd94e9f':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:36:54 +00:00
Robert Greenwalt
74acf23a1e am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '3c417fbf21133340cbbe3539d87c453f81ae3a9d':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:36:44 +00:00
Robert Greenwalt
3c417fbf21 Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 2014-04-07 19:30:10 +00:00
Craig Mautner
7bd0b65233 am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit '4bdab6bb4c55661d4915518b1190e30c4633c6a5':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:18:36 +00:00
Craig Mautner
4bdab6bb4c Fix FLAG_DISMISS_KEYGUARD not working 
Fixes bug 13672528.

Change-Id: I0292aee51d5d8755bbae926e5f0e6af1e22107dc
 2014-04-01 12:10:54 -07:00
Robert Greenwalt
e1549ae364 DO NOT MERGE Sanitize WifiConfigs 
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data).  This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.

We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.

This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.

Bug:12663469
Change-Id: I80912cc08ffa1e4b63008c94630006cf316e7a64
 2014-03-28 14:54:53 -07:00
Robert Greenwalt
fe38ff8d36 DO NOT MERGE Sanitize WifiConfigs 
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data).  This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.

We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.

This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.

Bug:12663469
Change-Id: I98c0672a6d9c8d5bc4f160849aa0fa182073216b
 2014-03-28 11:38:33 -07:00
Craig Mautner
95d6e32bc3 am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit '86f9a93e20bf33b9f5152592f4781bd253be8643':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 09:48:27 -07:00
Craig Mautner
86f9a93e20 Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 2014-03-25 16:43:41 +00:00
Craig Mautner
0392442de8 Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs 
Previous fix to keep non-show-when-locked windows hid dialogs from
activities that had asked to be show-when-locked. That was too
restrictive.

Fixes bug 13225149.

Change-Id: I39ae9d7cbcc9b5109257f732d027bda3a2de65e4
 2014-03-22 17:15:52 -07:00
Marco Nelissen
665b07579a am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit '81fbdade8db4117157ea48602be121e6cf5597dd':
  Verify certificates
 2014-03-20 10:47:34 -07:00
Marco Nelissen
81fbdade8d resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394
 2014-03-20 10:27:58 -07:00
Marco Nelissen
534f3e9438 am a3337bc7: Merge "Verify certificates" into jb-dev 
* commit 'a3337bc7c3a98ec12b6dec281e26c34f82025bdd':
  Verify certificates
 2014-03-20 10:04:23 -07:00
Marco Nelissen
a3337bc7c3 Merge "Verify certificates" into jb-dev 2014-03-20 16:58:37 +00:00
Victoria Lease
3191212259 am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '6eb2810318262ff36014c52384ed3cdea19bd34e':
  malloc some advances
 2014-03-19 14:40:17 -07:00