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

223297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Hung
7c798c13a7 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread 
am: 0a887bcd5c

* commit '0a887bcd5c5a8056735d221ad71afcff1f6eb1a6':
  DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
 2015-12-03 19:24:02 +00:00
Chris Wren
cf7021e827 Merge "Notification Assistant API" 2015-12-03 19:23:33 +00:00
Jeff Sharkey
23d188873a Merge "Avoid a double decrease of reference counter for unstable provider" am: e8651aed4b am: aae0a49c16 
am: a9c2218940

* commit 'a9c22189404b5cb1f4e66ca3ff99ed8e04403f1e':
  Avoid a double decrease of reference counter for unstable provider
 2015-12-03 19:22:30 +00:00
Jeff Sharkey
dd2e8d6a0e Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master am: 67003be3f8 
am: c32406e85b

* commit 'c32406e85b8e2a454c96d5ddfb1b494d8853879c':
 2015-12-03 19:20:55 +00:00
Jeff Sharkey
3a67ddeea9 Merge branch \'mnc-dr2-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr2-dev-plus-aosp 
am: 5ee15f0be3

* commit '5ee15f0be3fcc148335ff53319aac9ba9723dcf8':
 2015-12-03 19:19:34 +00:00
Yohei Yukawa
d42df4f68e Merge "Fix special handling of a fake language code "tl"." am: 9fd2af6b32 
am: 30e321b54a

* commit '30e321b54a589d33dc7f2dd7344bef95faaaf83d':
  Fix special handling of a fake language code "tl".
 2015-12-03 19:18:45 +00:00
Jeff Sharkey
f4a6dc52b1 Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" am: 29e0b6e789 am: af588a31bc 
am: 630f658108

* commit '630f65810860cbd15012a1d5e83a275695e332cd':
  StrictMode: fix deserialization of ViolationInfo on large stacks
 2015-12-03 19:18:15 +00:00
Jeff Sharkey
8fbf16f6c6 Merge "Fix race condition when collecting op callback." am: 98844a97d2 am: 678011854b 
am: 28d8b8c988

* commit '28d8b8c9882e501f95ec3076a4f1fffc759ea999':
  Fix race condition when collecting op callback.
 2015-12-03 19:16:45 +00:00
Jeff Sharkey
5cbbdf2ca6 Merge "Improved variable naming" am: 4ef9d41066 am: bc57510e9f 
am: ec0e46fbc6

* commit 'ec0e46fbc612cb9575ae3e7901664cd34666f438':
  Improved variable naming
 2015-12-03 19:15:12 +00:00
George Mount
d78c5d7c70 Merge "Revert "Give transitioning fragment a context prior to retrieving transition"" 2015-12-03 19:11:11 +00:00
Yohei Yukawa
30e321b54a Merge "Fix special handling of a fake language code "tl"." 
am: 9fd2af6b32

* commit '9fd2af6b323ef98695701a8bcfdd3ca1c4dd7965':
  Fix special handling of a fake language code "tl".
 2015-12-03 19:10:30 +00:00
George Mount
895eaa453e Merge "Revert "Choose the correct Fragment to pull a Transiton from."" 2015-12-03 19:10:08 +00:00
George Mount
214f6749fc Revert "Give transitioning fragment a context prior to retrieving transition" 
This reverts commit 2b2d23aa706c2d8efb05e15f08bdc41883a4a651.

Change-Id: Ib3010b4ba3c3d003d5143d9ea63d331c9c2d304e
 2015-12-03 19:09:59 +00:00
Felipe Leme
a413143afc Improved helper used to choose an activity. 
- Decrease delay by first checking if the activity is the default
  selection.
- Handle scrolling so it won't fail if the activity is not visible.

Change-Id: I8fce920bad207c3f35375316a139f20c1dcb9343
 2015-12-03 11:09:53 -08:00
George Mount
c30d875c7f Revert "Choose the correct Fragment to pull a Transiton from." 
This reverts commit fbaa14bc35e8d7366596053cac8a445084bac44c.

Change-Id: Ic6953554a97bf125a69209b1db973d7fc48ab31b
 2015-12-03 19:09:17 +00:00
Christine Hallstrom
044b8f3f03 Log API calls to createBond(), cancelBondProcess(), removeBond() 
In an attempt to better be able to debug Bluetooth-related parts of
the system, add info-level logging including calling process and
thread whenever the aforementioned functions are called.

Bug: 25996120
Change-Id: I5a72b2ab929f805ec1c43cc54879ed079a8dfe34
 2015-12-03 19:08:17 +00:00
Yohei Yukawa
9fd2af6b32 Merge "Fix special handling of a fake language code "tl"." 2015-12-03 19:04:24 +00:00
Chris Tate
c169181747 Merge "Improve docs for Parcelable.describeContents()" 2015-12-03 19:00:47 +00:00
George Mount
8e6fc083fe Remove accidentally left-in commented out line. 
Change-Id: Ic49b371a5138591051cd10e302e27535b165b2b3
 2015-12-03 10:53:15 -08:00
Wale Ogunwale
69970ceb71 Merge "Set proper stack in WM when activity is moved to stack in AM" 2015-12-03 18:51:13 +00:00
Chris Wren
9fa689f8b6 Notification Assistant API 
This API allows a single assistant on the device to help the
user manage their notification stream by taking actions on
individual notifications:

  - modifying their priority up or down when they are posted
  - possibly changing if and how the notification interrupts the user
  - adding annotations under notifications

Bug: 22455414
Change-Id: Idf47972bb71c83f1dc1c9ec68a6fa92ac4fc522f
 2015-12-03 13:45:10 -05:00
George Mount
e1abaa631e Adds a way to exclude test directories from javadoc. am: f6be993407 
am: c26d7c378a

* commit 'c26d7c378a58f4f312b8385baf4d318c2df35478':
  Adds a way to exclude test directories from javadoc.
 2015-12-03 18:38:48 +00:00
George Mount
c26d7c378a Adds a way to exclude test directories from javadoc. 
am: f6be993407

* commit 'f6be99340769cae717a604c7362f85830e4601c6':
  Adds a way to exclude test directories from javadoc.
 2015-12-03 18:29:46 +00:00
Adam Skory
a1d8f42fcd Merge "Make isAppProvidedWebUri false from setDefaultIntent()" 2015-12-03 18:29:05 +00:00
Wale Ogunwale
2998eef694 Set proper stack in WM when activity is moved to stack in AM 
When an activity is moved to a stack using the
ActivityStack#moveActivityToStack API a new task is created to
hold the activity in the stack. However, when the new task is
created in the window manager side it uses the stack id of the
previous stack the activity was in. We now pass the stack to use
from activity manager to window manager.

Bug: 25987309
Bug: 25961636
Change-Id: Iecc71f6d9b3e70a8d88e134b42f7532ba5327bad
 2015-12-03 10:20:16 -08:00
George Mount
f6be993407 Adds a way to exclude test directories from javadoc. 
By adding a file named NO_DOCS to a directory, all
java files under that directory will be ignored for
javadoc builds. This is especially useful for marking
test projects as not participating in the javadoc
build.

Change-Id: I3b0259f4bb3c8460c3560fdcf97c6cac11d8001d
 2015-12-03 10:12:52 -08:00
Christopher Wiley
d295e94dad Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException" am: 0ded0da517 
am: 4ff2cc0898

* commit '4ff2cc0898891488dce3917d105f15264b7742ce':
  Map Errors.h's UNEXPECTED_NULL to NullPointerException
 2015-12-03 17:54:08 +00:00
Christopher Wiley
4ff2cc0898 Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException" 
am: 0ded0da517

* commit '0ded0da51743a24707bece4b0be05f49db3b9981':
  Map Errors.h's UNEXPECTED_NULL to NullPointerException
 2015-12-03 17:46:58 +00:00
Christopher Wiley
0ded0da517 Merge "Map Errors.h's UNEXPECTED_NULL to NullPointerException" 2015-12-03 17:43:43 +00:00
Jeff Sharkey
a9c2218940 Merge "Avoid a double decrease of reference counter for unstable provider" am: e8651aed4b 
am: aae0a49c16

* commit 'aae0a49c164e9eeb19d46967c84697cd1a3a6783':
  Avoid a double decrease of reference counter for unstable provider
 2015-12-03 17:16:30 +00:00
Jeff Sharkey
c32406e85b Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master 
am: 67003be3f8

* commit '67003be3f8a53c1d11d130d53d866255bd04d2c7':
 2015-12-03 17:15:06 +00:00
Jeff Sharkey
5ee15f0be3 Merge branch 'mnc-dr2-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr2-dev-plus-aosp 2015-12-03 17:14:11 +00:00
Jeff Sharkey
630f658108 Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" am: 29e0b6e789 
am: af588a31bc

* commit 'af588a31bc62b791014b3cc4e655107e9446e3d0':
  StrictMode: fix deserialization of ViolationInfo on large stacks
 2015-12-03 17:13:43 +00:00
Jeff Sharkey
ead3f44aef Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" am: 29e0b6e789 
am: af588a31bc

* commit 'af588a31bc62b791014b3cc4e655107e9446e3d0':
  StrictMode: fix deserialization of ViolationInfo on large stacks
 2015-12-03 17:12:41 +00:00
Jeff Sharkey
28d8b8c988 Merge "Fix race condition when collecting op callback." am: 98844a97d2 
am: 678011854b

* commit '678011854b0969f5fe69d597911beabcadcb03e8':
  Fix race condition when collecting op callback.
 2015-12-03 17:11:22 +00:00
Jeff Sharkey
ec0e46fbc6 Merge "Improved variable naming" am: 4ef9d41066 
am: bc57510e9f

* commit 'bc57510e9f359929a55130d8a35c61a84dad4568':
  Improved variable naming
 2015-12-03 17:09:59 +00:00
Jeff Sharkey
aae0a49c16 Merge "Avoid a double decrease of reference counter for unstable provider" 
am: e8651aed4b

* commit 'e8651aed4b8a2c6703589069e26f5be750b2a947':
  Avoid a double decrease of reference counter for unstable provider
 2015-12-03 17:07:50 +00:00
Jeff Sharkey
67003be3f8 Merge branch 'stage-aosp-master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master 2015-12-03 17:06:57 +00:00
Jeff Sharkey
af588a31bc Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" 
am: 29e0b6e789

* commit '29e0b6e7891091614a9e9dd6083017d0c9d454ae':
  StrictMode: fix deserialization of ViolationInfo on large stacks
 2015-12-03 17:06:24 +00:00
Jeff Sharkey
d5cefab28c Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" 
am: 29e0b6e789

* commit '29e0b6e7891091614a9e9dd6083017d0c9d454ae':
  StrictMode: fix deserialization of ViolationInfo on large stacks
 2015-12-03 17:05:16 +00:00
Jeff Sharkey
678011854b Merge "Fix race condition when collecting op callback." 
am: 98844a97d2

* commit '98844a97d2bd07146854783374ee3a19aed8edd5':
  Fix race condition when collecting op callback.
 2015-12-03 17:03:53 +00:00
Jeff Sharkey
bc57510e9f Merge "Improved variable naming" 
am: 4ef9d41066

* commit '4ef9d41066d8b4124c2c59752512adf24102634d':
  Improved variable naming
 2015-12-03 17:02:21 +00:00
Jeff Sharkey
e8651aed4b Merge "Avoid a double decrease of reference counter for unstable provider" 2015-12-03 16:59:58 +00:00
Jeff Sharkey
29e0b6e789 Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" 2015-12-03 16:59:13 +00:00
Jeff Sharkey
98844a97d2 Merge "Fix race condition when collecting op callback." 2015-12-03 16:58:34 +00:00
Jeff Sharkey
4ef9d41066 Merge "Improved variable naming" 2015-12-03 16:58:03 +00:00
Matt Sarett
5c3252ec97 Change dependency to match renamed libjpeg-turbo 
Change-Id: Ie5a88e0e011dc655cff564de28928938112a3073
 2015-12-03 16:23:43 +00:00
Clara Bayarri
10ad84a17d Create a separate Work Challenge check 
This allows us to tell lock checks from FBE checks separately,
and will be useful when dealing with password unification.

Change-Id: Ifbea425f749fee4d6d51faddd8b64bf717a1a5f8
 2015-12-03 16:18:53 +00:00
Clara Bayarri
29fcf1b1db Apply Admin password restrictions to work profile 
When the Work Challenge is in place, re-route the
enforcing of Admin policies on the password to the
work profile. The Admin should not be allowed to
dictate policies on the device lock in this case.

This is part of the Separate Work Challenge feature.

Change-Id: I757973e540797b5fb10bea7a2fd1925561655bc9
 2015-12-03 16:18:53 +00:00
Robin Lee
b3958d766b Merge "DPMS: Replace ArrayList<>(1) with SingletonList" 2015-12-03 16:12:54 +00:00