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

153738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Larimer
88add68942 am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 
* commit 'a5ccca242747d59233ec5ecebc20d4a721e7850e':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2015-01-29 18:32:09 +00:00
Jon Larimer
a43742ec62 am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev 
* commit '6813f29e3247f0567b77fe7eb451215b5fadf67b':
  DO NOT MERGE Restore calling identity before checking permission
 2015-01-29 18:32:05 +00:00
Jon Larimer
074c11161a am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6 -s ours 
automerge: f8571c8a  -s ours

* commit 'f8571c8a170f0cb8341b3e2adda306bb709b824a':
 2015-01-29 18:25:48 +00:00
Jon Larimer
a5ccca2427 am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 
* commit '2982d64802ed0d5b59130680c43485e9d7862e50':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2015-01-29 18:25:28 +00:00
Jon Larimer
6813f29e32 am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev 
* commit '76cdbb0475fe881c8e7320c277e5ea4848be5bff':
  DO NOT MERGE Restore calling identity before checking permission
 2015-01-29 18:25:24 +00:00
Jon Larimer
2982d64802 am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 
* commit 'de9a76ed997c300a6c5f2f82c517719503af9045':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2015-01-29 18:12:01 +00:00
Jon Larimer
76cdbb0475 am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev 
* commit 'd0318a63e51107d5589d8970b079c27d8f788c5a':
  DO NOT MERGE Restore calling identity before checking permission
 2015-01-29 18:11:57 +00:00
Jon Larimer
f8571c8a17 am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev 
automerge: 7ab0ac6  -s ours

* commit '7ab0ac6927538ad3e7d09adc3524b88bfad75abc':
  DO NOT MERGE Restore calling identity before checking permission
 2015-01-29 18:10:34 +00:00
Jon Larimer
336fc1fff7 am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev 
* commit '7ab0ac6927538ad3e7d09adc3524b88bfad75abc':
  DO NOT MERGE Restore calling identity before checking permission
 2015-01-29 18:09:27 +00:00
Jon Larimer
7ab0ac6927 am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev 
* commit '64d6bacf13e4ae913c52b773439a542dc5b2b714':
  DO NOT MERGE Restore calling identity before checking permission
 2015-01-29 18:02:27 +00:00
Jon Larimer
de9a76ed99 am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 
* commit 'fc731e6e40f6f449b8e7ac72c2cd36a57c04a32b':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2015-01-29 18:00:58 +00:00
Jon Larimer
d0318a63e5 am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev 
* commit '7dd12d7633663c7f5802bdaaf8e7232a48aba811':
  DO NOT MERGE Restore calling identity before checking permission
 2015-01-29 18:00:55 +00:00
Jon Larimer
64d6bacf13 am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev 
* commit '2f4ad45d60aac5b2b025e9eac34e289d406645dc':
  DO NOT MERGE Restore calling identity before checking permission
 2015-01-29 17:55:10 +00:00
Jon Larimer
fc731e6e40 Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 2015-01-29 17:48:58 +00:00
Jon Larimer
2f4ad45d60 Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev 2015-01-29 17:48:24 +00:00
Jon Larimer
7dd12d7633 Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev 2015-01-29 17:48:20 +00:00
Dirk Dougherty
8b1ad8e4d1 am 49738792: Doc change: Update Ads terms language. 
* commit '497387928d53cca060c3f43b3a9f5c7834564333':
  Doc change: Update Ads terms language.
 2015-01-29 00:24:39 +00:00
Dirk Dougherty
497387928d Doc change: Update Ads terms language. 
Change-Id: I57cf037229f966f52c20c05f6ac29cc6774b1643
 2015-01-29 00:16:25 +00:00
Deepanshu Gupta
224e931fed Limited AppCompat support 
Change-Id: I4ac7234c9533b9f47f070335c4cb6ae605d8a89f
 2015-01-28 11:32:30 -08:00
Leon Scroggins III
3c9376a5a2 am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 
automerge: 5d7bd13

* commit '5d7bd13fc88d066d4c27a2459f3e3a58a1f4dec2':
 2015-01-28 18:23:47 +00:00
Leon Scroggins III
5d7bd13fc8 am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
automerge: 1e0d4b5

* commit '1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c':
  Handle bad ninepatch data.
 2015-01-28 17:39:52 +00:00
Adam Lesinski
f741c37273 Fix ParceledListSlice to enforce the same concrete types among its elements. 
Bug:17671747
Change-Id: I896f75738e5b464ccb6c03290f139cc2fa72f966
(cherry picked from commit 3df1c38ee098872352086e03d6f1adb16796ee29)
 2015-01-28 10:47:54 +00:00
Joe Fernandez
c6326f44bf am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs 
* commit '05defb992eefb8a32742d64c06e8e8fd02dbf670':
  docs: plugin for gradle typo
 2015-01-27 23:03:49 +00:00
Joe Fernandez
05defb992e Merge "docs: plugin for gradle typo" into lmp-docs 2015-01-27 22:57:30 +00:00
Leon Scroggins III
cae216f8dc am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit '1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c':
  Handle bad ninepatch data.
 2015-01-27 22:55:00 +00:00
Leon Scroggins III
1e0d4b5611 am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit '1dbbc2045ae16a4923b30c9576703d02a4363529':
  Handle bad ninepatch data.
 2015-01-27 22:48:29 +00:00
Leon Scroggins III
1dbbc2045a am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit '6106f6a490cb5816602e8e3ae84a5c653dda44d3':
  Handle bad ninepatch data.
 2015-01-27 22:42:03 +00:00
Leon Scroggins III
6106f6a490 am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit '9352296810926eae663477526545a55e1b1f7a27':
  Handle bad ninepatch data.
 2015-01-27 22:31:47 +00:00
Leon Scroggins III
9352296810 am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit '01287549ad415c51377683696eb37c362d43061a':
  Handle bad ninepatch data.
 2015-01-27 22:17:11 +00:00
Leon Scroggins III
01287549ad am 9a6143fa: Handle bad ninepatch data. 
* commit '9a6143fab7d93797e4b22a12b89e07c160e5c31d':
  Handle bad ninepatch data.
 2015-01-27 22:01:08 +00:00
Ricardo Cervera
8ec3eb4e7c am de113066: docs: Transitions training class. 
* commit 'de113066d80c3f19979eb531484af73f64640de9':
  docs: Transitions training class.
 2015-01-27 21:16:53 +00:00
Ricardo Cervera
de113066d8 docs: Transitions training class. 
Change-Id: Ib41b42a890c44fdc001242bc356442ef9201b591
 2015-01-27 11:35:20 -08:00
Leon Scroggins III
9a6143fab7 Handle bad ninepatch data. 
Changes proposed by Ben Hawkes of Google Project Zero.

NinePatchPeeker.cpp:
Instead of asserting, return false for bad data.

ResourceTypes.h:
Store ninepatch values as unsigned.

BUG:19151999
Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2
(cherry picked from commit a730ef3f77fc495bc90199b4d45efab26d609782)
 2015-01-27 19:04:57 +00:00
Sarah Maddox
95226c981b am 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs 
* commit '912cacde8619d28ea1d4a3f6ebf30be1c8a5d47a':
  docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
 2015-01-26 20:23:25 +00:00
Sarah Maddox
912cacde86 Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs 2015-01-26 20:16:37 +00:00
Rich Slogar
c3e0107ce3 docs: studio proxy setup 
Change-Id: Ifbe3f03a47cfb1a59ade4e2fb678a51a7256fdb4
 2015-01-26 11:59:30 -08:00
Ricardo Cervera
d064ce7e8b am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs 
* commit 'edb7a4420bfbf3e7f9efc06718b45c56bbd3dc2d':
  docs: Wear DataItem listener improvements
 2015-01-26 19:39:48 +00:00
Ricardo Cervera
edb7a4420b Merge "docs: Wear DataItem listener improvements" into lmp-docs 2015-01-26 19:32:13 +00:00
Sarah Maddox
ed91b0dd7e docs: Adds new geocoding sample to Location API training. 
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.

Bug: 17109822
Change-Id: I96dbf348e9ae41dbbeb075e6540620afc304d3b6
 2015-01-26 11:06:55 -08:00
Rich Slogar
639248789c docs: plugin for gradle typo 
b/19106103

Change-Id: I3db503ccd5a93ee0a3bdf6dfb8c76f7391a5e75e
 2015-01-23 09:57:37 -08:00
Rich Slogar
78f75b29fa docs: remove + annotations in version references 
b/18417182

Change-Id: I16181a4ebb7a4ac40a7307438e120489b806f24e
 2015-01-22 17:48:43 -08:00
Ricardo Cervera
02d093ca67 am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs 
* commit 'bdfcd56e7f01b7bb1f50c932792b9528c67892e5':
  docs: Fixes to the watch faces design guidelines
 2015-01-22 17:56:54 +00:00
Ricardo Cervera
bdfcd56e7f Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs 2015-01-22 17:50:48 +00:00
Ricardo Cervera
4bfde48739 docs: Fixes to the watch faces design guidelines 
Bug: 19001253

Change-Id: I356b887de71710afa27acc7544d0efdc3a857e91
 2015-01-22 09:46:43 -08:00
Luan Nguyen
edb9ba54f7 am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) 
* commit '1dd76ea2760f84496a5b82435fc35d7c28a6dd6d':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-22 17:29:30 +00:00
Luan Nguyen
1dd76ea276 docs: Fix companion configuration (18864041) 
Fix declaration of var and incorrect method call (18617393)

bug: 18864041
bug: 18617393
Change-Id: Ic31e44acfe7338f56acdbbd97ba8cc1e87042b53
 2015-01-22 08:15:57 -08:00
Rich Slogar
d7ffcad49b docs: linux requirements update 
b/18371514

Change-Id: I8e320b53bca248d37bff22e4313041d0c138779f
 2015-01-21 15:36:02 -08:00
Andrew Solovay
e628954ea4 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs 
* commit '78f4342fac982a130a62dac2a459cef2a4c29f5a':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:10:59 +00:00
Luan Nguyen
8884edaaeb am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs 
* commit 'f082f8980e742e9a60aeb91271caff38e10cf0a8':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
 2015-01-21 23:10:55 +00:00
Rich Slogar
b01e3fa104 docs: studio emulator platform update 
b/5122160

Change-Id: I82966b0e9f32dc6e6641681f7726a8a8074525ff
 2015-01-21 13:52:56 -08:00