Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
180,759 Commits 3 Branches 0 Tags
cd7b506c19dff4a68b46631fcede73f55547f985
Commit Graph

180759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Franz
cd7b506c19 am bfca5f40: am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 
automerge: 07b87e5

* commit '07b87e537da3ec658235fe1d874c7dba5b4d696d':
  Avoid SecurityException when calling getUserData
 2015-01-23 14:46:31 +00:00
Benjamin Franz
07b87e537d am bfca5f40: am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 
* commit 'bfca5f40eb9e5d888218c615fa744e5d8ea2d207':
  Avoid SecurityException when calling getUserData
 2015-01-23 14:42:38 +00:00
Benjamin Franz
bfca5f40eb am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 
* commit '266303fdb02ca1cf6df348e1af6830675476fd78':
  Avoid SecurityException when calling getUserData
 2015-01-23 14:37:42 +00:00
Benjamin Franz
266303fdb0 Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 2015-01-23 14:33:06 +00:00
Sudheer Shanka
0db053a33c Merge "Clear leftover state between resolving calls." 2015-01-23 13:36:38 +00:00
Lorenzo Colitti
98dd474f47 am 50f9d93a: am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev 
automerge: 5c9546b

* commit '5c9546b1dabd36ad8358705ac617ea3c606d5317':
  Support connecting to networks with misconfigured subnet masks.
 2015-01-23 13:05:26 +00:00
Lorenzo Colitti
5c9546b1da am 50f9d93a: am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev 
* commit '50f9d93a1c6f3d9f28966dd61997b4b780f31fb2':
  Support connecting to networks with misconfigured subnet masks.
 2015-01-23 13:01:42 +00:00
Lorenzo Colitti
50f9d93a1c am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev 
* commit 'ae38596bcf2a077753d170c0cad68f4dfde4277b':
  Support connecting to networks with misconfigured subnet masks.
 2015-01-23 12:56:58 +00:00
Lorenzo Colitti
ae38596bcf Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev 2015-01-23 12:50:32 +00:00
Sudheer Shanka
7e64e109cd Clear leftover state between resolving calls. 
Because mOtherProfile variable was not cleared, we were directing
the user to the work intent resolved in the previous call, as well
as showing an extra item in the list.

Bug: 19070842
Change-Id: I48107c4914e7662d862ba4fe83368d65fc0c7966
 2015-01-23 12:22:14 +00:00
Lorenzo Colitti
2dfb79a54a Support connecting to networks with misconfigured subnet masks. 
In K and earlier, we would connect to a network where the gateway
was not covered by the subnet mask of the IP address. This is an
invalid configuration, but it used to work, and other OSes appear
to accept it too, so support it.

Bug: 19067207
Change-Id: I822e1d754b336691b675438eefa959a3d75fd07b
 2015-01-23 21:10:34 +09:00
Narayan Kamath
ad0d879e52 Merge "Remove superfluous OpenSSL include paths." automerge: fe24754 automerge: d555cd5 
automerge: c2d5128

* commit 'c2d51280395749328b0bb7a283cbc6037606822e':
  Remove superfluous OpenSSL include paths.
 2015-01-23 11:05:28 +00:00
Narayan Kamath
c2d5128039 Merge "Remove superfluous OpenSSL include paths." automerge: fe24754 
automerge: d555cd5

* commit 'd555cd550d634192e96e3b834f91aa9559a259db':
  Remove superfluous OpenSSL include paths.
 2015-01-23 10:54:44 +00:00
Narayan Kamath
d555cd550d Merge "Remove superfluous OpenSSL include paths." 
automerge: fe24754

* commit 'fe24754fd69e75829c748b56e5806f1603835db9':
  Remove superfluous OpenSSL include paths.
 2015-01-23 10:50:41 +00:00
Narayan Kamath
fe24754fd6 Merge "Remove superfluous OpenSSL include paths." 2015-01-23 10:47:34 +00:00
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
9ffad071a9, 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
Adam Langley
0e7829e428 Remove superfluous OpenSSL include paths. 
The libcrypto and libssl modules (and their respective static and host
versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module
is sufficient.

Change-Id: I467f1b1d038b5136fa22b1230da134c394eac54e
 2015-01-22 17:15:13 -08: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