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

180742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jinsuk Kim
7127d264d1 am 3379c1cb: Fix broken build automerge: 2652c57 
automerge: 304f696

* commit '304f696b34592d0eb75339da91a71864884322c1':
  Fix broken build
 2015-01-23 08:27:29 +00:00
Jinsuk Kim
304f696b34 am 3379c1cb: Fix broken build 
automerge: 2652c57

* commit '2652c57257416f088de3e5b359f36a63e3cbe91d':
  Fix broken build
 2015-01-23 08:23:27 +00:00
Jinsuk Kim
2652c57257 am 3379c1cb: Fix broken build 
* commit '3379c1cb62488393c2c49b5f38483656c7175fa1':
  Fix broken build
 2015-01-23 08:19:56 +00:00
Jinsuk Kim
3379c1cb62 Fix broken build 
Updated system-current.txt

Change-Id: I1f80d5543f0a828cf59d50d1271916a1210674d3
 2015-01-23 17:13:50 +09:00
Jinsuk Kim
f6483ac515 am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev automerge: 9ae7d49 
automerge: 55055d6

* commit '55055d690e77ab4547e2598d7da48e274b7adc67':
  CEC: Add logic to return to internal source
 2015-01-23 07:04:38 +00:00
Jinsuk Kim
55055d690e am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev 
automerge: 9ae7d49

* commit '9ae7d4975ce471a7b295282ca999cb20a6cbb273':
  CEC: Add logic to return to internal source
 2015-01-23 07:00:40 +00:00
Jinsuk Kim
9ae7d4975c am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev 
* commit '76cf035513d843c66d2fafe85b6a37c4c19b9223':
  CEC: Add logic to return to internal source
 2015-01-23 06:56:24 +00:00
Jinsuk Kim
76cf035513 Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev 2015-01-23 06:51:58 +00:00
Lorenzo Colitti
e871f0176d am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev automerge: fbaf6b3 
automerge: 6840ffa

* commit '6840ffae6761b369992fceb6b880cd9cd600b136':
  Use the proper IpPrefix and LinkAddress constructors in VPN code.
 2015-01-23 06:10:48 +00:00
Lorenzo Colitti
6840ffae67 am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev 
automerge: fbaf6b3

* commit 'fbaf6b353dc9b7218b340acf629b06ae8e0101bb':
  Use the proper IpPrefix and LinkAddress constructors in VPN code.
 2015-01-23 06:06:57 +00:00
Lorenzo Colitti
fbaf6b353d am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev 
* commit '78d51c2292b5a3b56be1b1e92bc67b70f4eebce4':
  Use the proper IpPrefix and LinkAddress constructors in VPN code.
 2015-01-23 06:03:46 +00:00
Lorenzo Colitti
78d51c2292 Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev 2015-01-23 05:57:38 +00:00
Ying Wang
f0ab37c2b9 Update current System API file. 
The file was generated by "make update-api".
The concerned API change has actually be submitted in commit
9ffad071a9956ba2603475b060f271900a4d2e26, which didn't include the
system API update, for presumably an out-of-date build project.

Bug: 18777272
Change-Id: I32e0903afc492b61f36d29ec88e728780158a553
 2015-01-22 21:44:37 -08:00
Lorenzo Colitti
b205311456 Use the proper IpPrefix and LinkAddress constructors in VPN code. 
This simplifies the code, and also makes it possible for
users to point multicast routes at the VPN. The LinkAddress
objects we were previously using to construct the RouteInfo do
not accept these, but IpPrefix objects do.

Bug: 18485968
Change-Id: Ie914a2eb359b78161810ee473df725059f944f4e
 2015-01-23 14:30:22 +09:00
Adam Lesinski
9ca9aace3d Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev automerge: b443610 automerge: 83f58a2 
automerge: e03f2cb

* commit 'e03f2cb2c26d30c277d38566976bb4b00326d465':
  AAPT: Use the right enum when checking for density configurations
 2015-01-23 03:58:12 +00:00
Adam Lesinski
e03f2cb2c2 Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev automerge: b443610 
automerge: 83f58a2

* commit '83f58a2f7afac98199536b3090fe6f767ffb3a0d':
  AAPT: Use the right enum when checking for density configurations
 2015-01-23 02:46:32 +00:00
Adam Lesinski
83f58a2f7a Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev 
automerge: b443610

* commit 'b443610bcb9a1f0d8e64b55c7d6e53bc54d7ec43':
  AAPT: Use the right enum when checking for density configurations
 2015-01-23 02:36:39 +00:00
Adam Lesinski
b443610bcb Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev 2015-01-23 02:29:50 +00:00
Adam Lesinski
ed643e8182 AAPT: Use the right enum when checking for density configurations 
Bug:19116675
Change-Id: I2322d8d6bdf890005c80014273e5d07df735ed50
 2015-01-22 18:19:44 -08:00
Brian Attwell
9ffad071a9 Unhide AggregationSuggestions.Builder 
Additional unbundling from ContactsContract.

I'm going to remove all parameter types except name.
None of them have been implemented since they were
defined in ICS.

Bug: 18777272
Change-Id: I5c4066d1e933cc4ab18df06809687ee2b7eac91c
 2015-01-23 01:54:30 +00:00
Eino-Ville Talvala
ac829206a9 Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev automerge: 7fde5e5 automerge: 0ec0465 
automerge: 92baed1

* commit '92baed1212dffcae042a33f5575f99d3e00f81c8':
  Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
 2015-01-23 00:55:23 +00:00
Eino-Ville Talvala
92baed1212 Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev automerge: 7fde5e5 
automerge: 0ec0465

* commit '0ec0465542ba41634ed13dd6bae2eca6afa62d4a':
  Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
 2015-01-23 00:31:41 +00:00
Eino-Ville Talvala
0ec0465542 Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev 
automerge: 7fde5e5

* commit '7fde5e5ba3d306bc694e2b97edf5892755fcb6d0':
  Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
 2015-01-23 00:08:32 +00:00
Eino-Ville Talvala
7fde5e5ba3 Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev 2015-01-23 00:05:26 +00:00
Craig Mautner
d31c16457a Merge "Even more debug for bug 17721767." into lmp-mr1-dev automerge: dbabf37 automerge: 5cb31f2 
automerge: b978450

* commit 'b978450b1c91f73eff63669ae3390627c0148dc4':
  Even more debug for bug 17721767.
 2015-01-22 23:56:29 +00:00
Craig Mautner
b978450b1c Merge "Even more debug for bug 17721767." into lmp-mr1-dev automerge: dbabf37 
automerge: 5cb31f2

* commit '5cb31f2179c70152f94bcb8309449fc2e7bed63a':
  Even more debug for bug 17721767.
 2015-01-22 23:37:51 +00:00
Craig Mautner
5cb31f2179 Merge "Even more debug for bug 17721767." into lmp-mr1-dev 
automerge: dbabf37

* commit 'dbabf37fd3a6b70be5cf9639f11656e12601154d':
  Even more debug for bug 17721767.
 2015-01-22 23:24:11 +00:00
Craig Mautner
dbabf37fd3 Merge "Even more debug for bug 17721767." into lmp-mr1-dev 2015-01-22 23:17:47 +00:00
Craig Mautner
de313753d0 Even more debug for bug 17721767. 
This time adding events for stack movement and focus change.

Change-Id: Icdff9763ac2daf85c615992fa2c8e418e907908c
 2015-01-22 14:28:03 -08:00
Rob Tsuk
b9307823dd Merge "Ensure compatible layout for vertices" 2015-01-22 22:04:56 +00:00
Rob Tsuk
a9fc9b20da Ensure compatible layout for vertices 
Require that these structs have standard layout, which is what we need
to pass them to OpenGL. Inheritence with data members violates the
rules for standard layout so I re-implemented them using templates to
share the code and putting all the data members in each struct.

Change-Id: I19cd0e5518728f2d3e0993b17d15fce7be7e0edb
 2015-01-22 13:53:42 -08:00
Jason Sams
daa880d9c5 am de56e38e: Merge "Fix default compute thread priority" automerge: 231df77 
automerge: cf109c5

* commit 'cf109c5905f197fac19aa32a0cede1067aa7e3dd':
  Fix default compute thread priority
 2015-01-22 21:24:15 +00:00
Jason Sams
6dd397bb22 am 712b05d0: Merge "Add FP16 types to the list of RenderScript types." automerge: 081cda8 
automerge: 305b8c4

* commit '305b8c473794801f45b3619bda642589001ba78d':
  Add FP16 types to the list of RenderScript types.
 2015-01-22 21:23:01 +00:00
Jason Sams
cf109c5905 am de56e38e: Merge "Fix default compute thread priority" automerge: 231df77 
* commit 'de56e38e9e8f7f4a54633b66e2952cea776d6ab5':
  Fix default compute thread priority
 2015-01-22 21:18:16 +00:00
Jason Sams
305b8c4737 am 712b05d0: Merge "Add FP16 types to the list of RenderScript types." automerge: 081cda8 
* commit '712b05d00b00a6148852e153ef76dfb5960623e9':
  Add FP16 types to the list of RenderScript types.
 2015-01-22 21:18:02 +00:00
Ying Wang
fbdb2c5721 Update master System API files. 
Bug: 18960664
Change-Id: I7771352cb464d3b0220222821ad026a40f16bb92
 2015-01-22 13:17:08 -08:00
Jason Sams
de56e38e9e Merge "Fix default compute thread priority" 
automerge: 231df77

* commit '231df77eff4e31fead0dfadee6ea6ead980b24ea':
  Fix default compute thread priority
 2015-01-22 21:12:38 +00:00
Jason Sams
712b05d00b Merge "Add FP16 types to the list of RenderScript types." 
automerge: 081cda8

* commit '081cda87e1ed7d1c0f30408dbc6635afc48d98a0':
  Add FP16 types to the list of RenderScript types.
 2015-01-22 21:11:08 +00:00
Jason Sams
231df77eff Merge "Fix default compute thread priority" 2015-01-22 21:08:44 +00:00
Jason Sams
081cda87e1 Merge "Add FP16 types to the list of RenderScript types." 2015-01-22 21:08:03 +00:00
Ying Wang
eeef60fb7e am c5c99734: am abbf8d41: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 
* commit 'c5c99734cbbe68ab09a08c1b16f9ff66ff91ecf0':
 2015-01-22 20:58:21 +00:00
Ying Wang
1a3bc05a93 am 321e7246: am 301e1def: am 24328660: Merge "Check in "current" system API files." into lmp-mr1-dev 
* commit '321e72461bb561ea81f8f7bfaaa0c29e0180bc75':
  Check in "current" system API files.
 2015-01-22 20:58:16 +00:00
Brian Attwell
09341baa8e Merge "Revert "Expose ContentProviderOperation type"" 2015-01-22 20:54:53 +00:00
Brian Attwell
8b89f0b207 Revert "Expose ContentProviderOperation type" 
This reverts commit 9986f8e85a095320afbdebb2d0dfee9a2e19e510.

Change-Id: Icdcedf485a67fff4ab5e6bab9cc3e82aa7cc8760
 2015-01-22 20:54:08 +00:00
Brian Attwell
a29ce2d47d Merge "Expose ContentProviderOperation type" 2015-01-22 20:53:53 +00:00
Brian Attwell
9986f8e85a Expose ContentProviderOperation type 
CHANGE
isInsert, isDelete, isUpdate, isAssertQuery

JUSTIFICATION
The use of getType() in lots of unit tests means that
ContentProviderOperation#getType() can't practically be
removed.

Why not make it public? This allows 3p to use getType() in
unit tests. Plus it allows the unbundled contacts app
to continue using getType() in order to handle TYPE_INSERT
specially, without needing to awkwardly pass isInsert values
around.

Bug: 18777272
Change-Id: I3265193cda0c9405f6df896cd96a10df7225445a
 2015-01-22 12:53:29 -08:00
Ying Wang
c5c99734cb am abbf8d41: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 
* commit 'abbf8d419422f8bd0a3a6c5d9a266f21663c4dc4':
 2015-01-22 20:47:28 +00:00
Ying Wang
321e72461b am 301e1def: am 24328660: Merge "Check in "current" system API files." into lmp-mr1-dev 
* commit '301e1def7ab741830e1fbc02a291ff295a36c345':
  Check in "current" system API files.
 2015-01-22 20:47:22 +00:00
Ying Wang
abbf8d4194 Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 2015-01-22 20:41:46 +00:00
Ying Wang
301e1def7a am 24328660: Merge "Check in "current" system API files." into lmp-mr1-dev 
* commit '24328660c8f4f52647022fd0887978b74d607e06':
  Check in "current" system API files.
 2015-01-22 20:41:13 +00:00