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

204881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
594f76d25b am fcc62127: am 6b7f9ae6: (-s ours) am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE] 
* commit 'fcc6212778590a9d22379f21b414c4ee1e1bf7c2':
  Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
 2015-08-27 01:43:57 +00:00
Deepanshu Gupta
14b65389a2 am e3040e9a: am d6363d86: (-s ours) am 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE] 
* commit 'e3040e9a737b442a7860eaaafb691c780f3d0ce6':
  Inject anonymous inner classes of injected classes [DO NOT MERGE]
 2015-08-27 01:43:48 +00:00
Deepanshu Gupta
4efc48170e am 56c72f4c: am 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE] 
* commit '56c72f4c50556fc3072460fedf83145d73eb6f96':
  Update platformDir search in tests. [DO NOT MERGE]
 2015-08-27 01:43:42 +00:00
Deepanshu Gupta
268a461654 am 720d677f: am aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE] 
* commit '720d677fc29fdaaa8aed14f7eb1f0137cec5c3e9':
  Make Context.getClassLoader() work. [DO NOT MERGE]
 2015-08-27 01:43:35 +00:00
Deepanshu Gupta
a012a91b9d am ef319302: am 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE] 
* commit 'ef31930253fe9c0b0cc7d42c0f11181ffe69ea1b':
  Fix include tag rendering. [DO NOT MERGE]
 2015-08-27 01:43:28 +00:00
Deepanshu Gupta
54dd25f09d am a6d71a2c: am 8df6131a: (-s ours) am 50e1406a: am f6b08547: Show better error message for color attr not found. [DO NOT MERGE] 
* commit 'a6d71a2c37fbf4357ddb084ed5050c27826514ac':
  Show better error message for color attr not found. [DO NOT MERGE]
 2015-08-27 01:43:21 +00:00
Deepanshu Gupta
4c276bb904 am df44516b: am 59f026e9: (-s ours) am 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE] 
* commit 'df44516b78b6dd3c2ae5849a07a6e07e9302b668':
  Fix build: udpate parser factory method [DO NOT MERGE]
 2015-08-27 01:43:15 +00:00
Deepanshu Gupta
4509e3d2e7 am bf019327: am b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE] 
* commit 'bf01932797aa5ae8d94643b7861b45c89364b2ba':
  Don't keep LayoutlibCallback reference. [DO NOT MERGE]
 2015-08-27 01:43:03 +00:00
Deepanshu Gupta
7781467d48 am ef284578: am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE] 
* commit 'ef284578ee3b77890bcb45bbd1f89a5d244bced1':
  Remove kxml dependency [DO NOT MERGE]
 2015-08-27 01:42:56 +00:00
Deepanshu Gupta
fcc6212778 am 6b7f9ae6: (-s ours) am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE] 
* commit '6b7f9ae6f56375b1bd84f31206cac179e09b8146':
  Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
 2015-08-27 01:28:58 +00:00
Deepanshu Gupta
e3040e9a73 am d6363d86: (-s ours) am 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE] 
* commit 'd6363d86060126e20b913dcd6db3c5cc2019804c':
  Inject anonymous inner classes of injected classes [DO NOT MERGE]
 2015-08-27 01:28:48 +00:00
Deepanshu Gupta
56c72f4c50 am 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE] 
* commit '5b886bb08ff59e405c365db51abf71999e8f6c93':
  Update platformDir search in tests. [DO NOT MERGE]
 2015-08-27 01:28:42 +00:00
Deepanshu Gupta
720d677fc2 am aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE] 
* commit 'aae9c9309ca5155124f740b10a40c68b09ed0ce6':
  Make Context.getClassLoader() work. [DO NOT MERGE]
 2015-08-27 01:28:35 +00:00
Deepanshu Gupta
ef31930253 am 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE] 
* commit '522e67e4ac600fb19c18f55f0e51096af9ae37d3':
  Fix include tag rendering. [DO NOT MERGE]
 2015-08-27 01:28:21 +00:00
Deepanshu Gupta
a6d71a2c37 am 8df6131a: (-s ours) am 50e1406a: am f6b08547: Show better error message for color attr not found. [DO NOT MERGE] 
* commit '8df6131ac103ac58ab03f6aae01e136df3c6a7b1':
  Show better error message for color attr not found. [DO NOT MERGE]
 2015-08-27 01:28:14 +00:00
Deepanshu Gupta
df44516b78 am 59f026e9: (-s ours) am 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE] 
* commit '59f026e937e749a77f12614010f8be05123f4837':
  Fix build: udpate parser factory method [DO NOT MERGE]
 2015-08-27 01:28:07 +00:00
Deepanshu Gupta
bf01932797 am b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE] 
* commit 'b44f7fda759394b6447f19c0b3c9a3fdf8f9cd95':
  Don't keep LayoutlibCallback reference. [DO NOT MERGE]
 2015-08-27 01:27:52 +00:00
Deepanshu Gupta
ef284578ee am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE] 
* commit '78d77bc379f42dfe020cf0719ceae14174cf1c33':
  Remove kxml dependency [DO NOT MERGE]
 2015-08-27 01:27:45 +00:00
Tim Kilbourn
dbcad63b43 am 8f1ea834: Handle the -a flag for dumpsys appops. 
* commit '8f1ea834f9af5ccf6cea1f529f63e727cd13b6a8':
  Handle the -a flag for dumpsys appops.
 2015-08-27 01:15:40 +00:00
Tim Kilbourn
8f1ea834f9 Handle the -a flag for dumpsys appops. 
Bug: 23017449
Change-Id: I6ce9ac368e2739153867c246893eb544d052834f
 2015-08-26 15:07:37 -07:00
Alan Viverette
3b83e5bf7b am 95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev 
* commit '9513785715e2325ee3a3269fbfe7b1f4409eff5c':
  Avoid NPE when getPositionForView() is called on detached view
 2015-08-26 20:45:42 +00:00
Alan Viverette
9513785715 Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev 2015-08-26 20:38:53 +00:00
Deepanshu Gupta
6b7f9ae6f5 am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE] 
* commit '678f0ea2ba47f06387670e9f75b13637a6446899':
  Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
 2015-08-26 20:18:34 +00:00
Deepanshu Gupta
d6363d8606 am 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE] 
* commit '2e57c1e23f43bb0ede6280720559ccc1e866024b':
  Inject anonymous inner classes of injected classes [DO NOT MERGE]
 2015-08-26 20:18:27 +00:00
Deepanshu Gupta
5b886bb08f am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE] 
* commit '899daf759e02bef0de14dc1a14b96b4d71f0b9fc':
  Update platformDir search in tests. [DO NOT MERGE]
 2015-08-26 20:18:15 +00:00
Deepanshu Gupta
aae9c9309c am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE] 
* commit '2f50403fe0a8a035757b047af00c7520fadb9015':
  Make Context.getClassLoader() work. [DO NOT MERGE]
 2015-08-26 20:18:09 +00:00
Deepanshu Gupta
522e67e4ac am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE] 
* commit 'de3ac8f9fc5987ac1f1223da02b4275fdbae3d56':
  Fix include tag rendering. [DO NOT MERGE]
 2015-08-26 20:18:04 +00:00
Deepanshu Gupta
8df6131ac1 am 50e1406a: am f6b08547: Show better error message for color attr not found. [DO NOT MERGE] 
* commit '50e1406a4ad668179a9a3d28c58d68c0eee44237':
  Show better error message for color attr not found. [DO NOT MERGE]
 2015-08-26 20:17:51 +00:00
Deepanshu Gupta
59f026e937 am 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE] 
* commit '81990c3f988369c755590288b93508e30024c56c':
  Fix build: udpate parser factory method [DO NOT MERGE]
 2015-08-26 20:17:46 +00:00
Deepanshu Gupta
b44f7fda75 am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE] 
* commit '0a07bb95a1dd94c3457860a934d3ee546919cff2':
  Don't keep LayoutlibCallback reference. [DO NOT MERGE]
 2015-08-26 20:17:40 +00:00
Deepanshu Gupta
78d77bc379 am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE] 
* commit 'bbbdc2ad8939c28828a8441c0b24812c53a9eb66':
  Remove kxml dependency [DO NOT MERGE]
 2015-08-26 20:17:34 +00:00
Alan Viverette
898c7045e0 Avoid NPE when getPositionForView() is called on detached view 
Bug: 23557674
Change-Id: I76cb5f06081b2ac4c8f535df8d1a0aee17d2bb20
 2015-08-26 15:22:09 -04:00
Chien-Yu Chen
44674d69eb am e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev 
* commit 'e4c3ff2f50dd8126bee379dd3b078ecf36d6a294':
  Camera: Update for reprocess session
 2015-08-26 19:07:06 +00:00
Chien-Yu Chen
e4c3ff2f50 Merge "Camera: Update for reprocess session" into mnc-dev 2015-08-26 18:56:15 +00:00
Nicholas Sauer
028ef11abb am 7c17ec5f: Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev 
* commit '7c17ec5fa5cb51d12713016622e4b5a939c8bb76':
  Add GET_APP_OPS_STATS to Shell
 2015-08-26 18:25:25 +00:00
Nicholas Sauer
7c17ec5fa5 Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev 2015-08-26 18:17:03 +00:00
Alan Viverette
332bdb1627 am 8b73003f: am ea288fd3: Merge "Fix WallpaperCropper crash when setting wallpaper over 8MB" 
* commit '8b73003fa0723b971c022fe373cba271c95d78b2':
  Fix WallpaperCropper crash when setting wallpaper over 8MB
 2015-08-26 14:37:24 +00:00
Alan Viverette
8b73003fa0 am ea288fd3: Merge "Fix WallpaperCropper crash when setting wallpaper over 8MB" 
* commit 'ea288fd3d4272cc6cd5da94b942fc4cfdc76e030':
  Fix WallpaperCropper crash when setting wallpaper over 8MB
 2015-08-26 14:30:24 +00:00
Alan Viverette
ea288fd3d4 Merge "Fix WallpaperCropper crash when setting wallpaper over 8MB" 2015-08-26 14:20:43 +00:00
Deepanshu Gupta
678f0ea2ba am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE] 
* commit 'b318ff54fcd17e7aadd1b0251c34cba348898704':
  Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
 2015-08-26 05:55:07 +00:00
Deepanshu Gupta
2e57c1e23f am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE] 
* commit 'cc5e69e4fed8bb797dc3f83c1de32eaf4a52f324':
  Inject anonymous inner classes of injected classes [DO NOT MERGE]
 2015-08-26 05:55:02 +00:00
Deepanshu Gupta
899daf759e am d7e89906: Update platformDir search in tests. [DO NOT MERGE] 
* commit 'd7e89906a453a562a8fef303fc6c4068dfa5c0d0':
  Update platformDir search in tests. [DO NOT MERGE]
 2015-08-26 05:54:58 +00:00
Deepanshu Gupta
2f50403fe0 am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE] 
* commit 'afedbc47b3c8f3fa9955496e6ceb7f5702dd90a3':
  Make Context.getClassLoader() work. [DO NOT MERGE]
 2015-08-26 05:54:52 +00:00
Deepanshu Gupta
de3ac8f9fc am 92480a9a: Fix include tag rendering. [DO NOT MERGE] 
* commit '92480a9ad89a813bdf36185fa8c4d227d8415b4c':
  Fix include tag rendering. [DO NOT MERGE]
 2015-08-26 05:54:44 +00:00
Deepanshu Gupta
50e1406a4a am f6b08547: Show better error message for color attr not found. [DO NOT MERGE] 
* commit 'f6b08547458b9219da1717a79363f778bfc57dd0':
  Show better error message for color attr not found. [DO NOT MERGE]
 2015-08-26 05:54:39 +00:00
Deepanshu Gupta
81990c3f98 am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE] 
* commit 'b1370c2687f4b03f7b9b36f89bb636b5b65f9531':
  Fix build: udpate parser factory method [DO NOT MERGE]
 2015-08-26 05:54:33 +00:00
Deepanshu Gupta
0a07bb95a1 am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE] 
* commit 'aa72988955789be6e790c344daba3ef17abfcd98':
  Don't keep LayoutlibCallback reference. [DO NOT MERGE]
 2015-08-26 05:54:28 +00:00
Deepanshu Gupta
bbbdc2ad89 am 5c90c4f4: Remove kxml dependency [DO NOT MERGE] 
* commit '5c90c4f459c2a7213a197f7ee98ad71e85af31bc':
  Remove kxml dependency [DO NOT MERGE]
 2015-08-26 05:54:23 +00:00
Stephen Woo
cd2709ec7b Fix WallpaperCropper crash when setting wallpaper over 8MB 
Use large heap for WallpaperCropper to avoid OOM crash in
createBitmap().

Change-Id: I1dc171286eaf0da37323ccf9fab046ca17e2ff07
Signed-off-by: Stephen Woo <stephen.m.woo@intel.com>
Signed-off-by: Dan Liang <dan.liang@intel.com>
 2015-08-26 10:27:47 +08:00
Todd Kennedy
635c9915e6 am 5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev 
* commit '5983ae7b98bbe16b8a0a5ffe9203baa1ed58a8fb':
  Allow extra slop in battery stats
 2015-08-26 00:34:24 +00:00