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

138727 Commits

Author SHA1 Message Date
Chris Craik
cb9851d4fe Merge "Annotated the drawing commands." 2014-06-09 22:22:11 +00:00
Xiaolei Wang
b2b2ac1287 Add constants to Android TV On Device Search. 
Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a
 2014-06-09 15:07:17 -07:00
vandwalle
2ab9089dfa remember and report network score 
Change-Id: Iccb2ec603bc9c0d3cf1976d0cc3f343cb1096494
 2014-06-09 14:50:47 -07:00
Jeff Brown
238fd930fc Add @SystemApi annotation to internal permissions. (DO NOT MERGE) 
This is a first pass at annotating permissions that should not be
granted or used by to third-party apps but that may be required by
privileged system applications.  For this patch, the annotation was
only added to permissions that have a protection level of at least
system.  Signature-only permissions were left alone since they only
need to be visible to built-in components.

Change-Id: I189472028274c133793ad8e4068585c536dd7f38
 2014-06-09 14:31:41 -07:00
Jeff Brown
709ce0a4c6 Add support for @SystemApi annotation to aapt. (DO NOT MERGE) 
When aapt sees @SystemApi in the XML comment associated with a resource,
it will now remove this tag from the comment (since is it not meaningful as
a Javadoc tag) and instead add an @android.annotation.SystemApi annotation
to the declared type or member.  This enables easy downstream processing of
this annotation from generated code.

Change-Id: If984908477648c0c90be52fdc955fbb891d99b28
 2014-06-09 14:28:42 -07:00
Jeff Brown
5c507c1371 Rename PrivateApi annotation to SystemApi. (DO NOT MERGE) 
Change-Id: I97b473884f81ad375d0733e4766afe091dfdd854
 2014-06-09 14:28:11 -07:00
Amit Mahajan
437a77d4bb am 3f175a35: am e5a28d34: am 20c5ce50: Handle provisioning APN by turning off/on radio. 
* commit '3f175a3587f5f7c7d6189c0fd09468bae4e81325':
  Handle provisioning APN by turning off/on radio.
 2014-06-09 21:12:43 +00:00
Justin Koh
ce8c1086fb am eba8782a: Add NPE check to getSystemWindowInsets 
* commit 'eba8782a1f8412a3510fc78a71b843ef6e89bdbb':
  Add NPE check to getSystemWindowInsets
 2014-06-09 21:12:39 +00:00
Justin Koh
2be4ddc403 am a5de8479: Merge "Fix Browser when running on a platform without webview" into klp-modular-dev 
* commit 'a5de8479f442b7e6f8d285db58713e42fb922798':
  Fix Browser when running on a platform without webview
 2014-06-09 21:12:35 +00:00
Robert Ly
a60406f546 am e70609c8: am 5cb18054: am e115755d: Merge "remove erroneous file" into klp-docs 
* commit 'e70609c87e7de59dbe9c01226bd251a705e71305':
  remove erroneous file
 2014-06-09 21:12:31 +00:00
Adam Lesinski
5fed49f7d6 am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev 
* commit '4d9fcae2024c9be8d5bd7e92cd836aa8b9cacc5b':
  Allow for a NoOp implementation of DrmManagerClientImpl
 2014-06-09 21:12:25 +00:00
Michael Kolb
1e6706abb2 am 4bdc93d6: Merge "Remove circular mask" into klp-modular-dev 
* commit '4bdc93d63e9edc7840a227ea1824f1f7ac93933e':
  Remove circular mask
 2014-06-09 21:12:19 +00:00
Jeff Brown
a2f61a39ea Merge "Add @SystemApi annotation to internal permissions." 2014-06-09 21:05:43 +00:00
Jeff Brown
96c2e9f1cb Merge "Add support for @SystemApi annotation to aapt." 2014-06-09 21:05:17 +00:00
Michael Wright
6fffd2b854 Merge "Pack PointerCoords with BitSet. DO NOT MERGE" into lmp-preview-dev 2014-06-09 20:53:55 +00:00
Antonio Calabrese
ff7215aa0c Annotated the drawing commands. 
Change-Id: I4eeb35ecaf4aa16e0924b5215351fce79c68369b
 2014-06-09 13:37:00 -07:00
Michael Wright
cb183fcd6e Pack PointerCoords with BitSet. DO NOT MERGE 
The converstion from Java PointerCoords to native and then back again
was inconsistent. Using a BitSet for all of these operations keeps it
in sync.

Bug: 15000382
Change-Id: Id3a4558dae3ba3df7c4a9b3cb9d5580b957db8d5
 2014-06-09 13:24:53 -07:00
Matthew Williams
508a8a0ab4 Merge "Add test app for JobScheduler" into lmp-preview-dev 2014-06-09 20:23:10 +00:00
Amit Mahajan
3f175a3587 am e5a28d34: am 20c5ce50: Handle provisioning APN by turning off/on radio. 
* commit 'e5a28d34f662c469f85590dda28fc02eca12204b':
  Handle provisioning APN by turning off/on radio.
 2014-06-09 19:50:09 +00:00
Amit Mahajan
e5a28d34f6 am 20c5ce50: Handle provisioning APN by turning off/on radio. 
* commit '20c5ce50c456742bf912ebb915be45bfdb51487d':
  Handle provisioning APN by turning off/on radio.
 2014-06-09 19:46:01 +00:00
RoboErik
e252909394 am 6580a31d: Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev 
* commit '6580a31db0727dfffba99069f4866ad01fc88cfb':
  Adds listeners for changes to the list of active sessions
 2014-06-09 19:29:58 +00:00
RoboErik
03df2c5153 am 91ead28f: Merge "b/15388389 Add volume handling support to MediaRouter" into lmp-preview-dev 
* commit '91ead28f8e0d22df8c4eaed4295e8c0e1e21e35f':
  b/15388389 Add volume handling support to MediaRouter
 2014-06-09 19:29:53 +00:00
RoboErik
58af2199a5 am ddbdcd09: Merge "Add a way to get the package/pid of the session" into lmp-preview-dev 
* commit 'ddbdcd092d1b71b987d680a8b1a5140832625410':
  Add a way to get the package/pid of the session
 2014-06-09 19:29:48 +00:00
RoboErik
5f670bd65c am 7d0b1256: Merge "b/15452153 Send 0 delta volume requests" into lmp-preview-dev 
* commit '7d0b1256e3a08a1b0a98f217eb9a0e9f5809f57e':
  b/15452153 Send 0 delta volume requests
 2014-06-09 19:29:42 +00:00
Jae Seo
8799179638 am a6b44fe7: Merge "Fix a typo in TvContract" into lmp-preview-dev 
* commit 'a6b44fe7d3ab727de2b82d73209efdc9bdb57b41':
  Fix a typo in TvContract
 2014-06-09 19:29:28 +00:00
Jerome Poichet
7fc1e22150 am 576563c3: Merge "Using Manufacturer and not brand for device name" into lmp-preview-dev 
* commit '576563c3d37ba58bc94e87aa385d92dc79498003':
  Using Manufacturer and not brand for device name
 2014-06-09 19:29:23 +00:00
Jae Seo
9aea9c93c5 am 73fe04a4: Merge "TIF: Address the feedback from the API review - 3/3" into lmp-preview-dev 
* commit '73fe04a41f88eb9e4a9da8e229351ce8458d0e0d':
  TIF: Address the feedback from the API review - 3/3
 2014-06-09 19:29:17 +00:00
Dan Sandler
0d99a507b2 am 6e73d4a9: Fix mangled XML. 
* commit '6e73d4a9d9d1031d302a7e1f21939c9239c0549d':
  Fix mangled XML.
 2014-06-09 19:29:08 +00:00
Dan Sandler
f730eab54c am d8349135: Pour one out for the old notification ticker. 
* commit 'd8349135a3189d4d4fd4180b0bffd2a987d4379d':
  Pour one out for the old notification ticker.
 2014-06-09 19:29:02 +00:00
Daniel Sandler
d343aff26d am e7078cf9: Move CATEGORY_NOTIFICATION_PREFERENCES to Notification. 
* commit 'e7078cf9c41f5e3581a80b2129ae77719b0f69a4':
  Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
 2014-06-09 19:28:56 +00:00
RoboErik
a3d8188556 Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev 2014-06-09 19:07:49 +00:00
RoboErik
55f6ab4c81 Merge "b/15388389 Add volume handling support to MediaRouter" into lmp-preview-dev 2014-06-09 19:07:34 +00:00
RoboErik
20685929a4 Merge "Add a way to get the package/pid of the session" into lmp-preview-dev 2014-06-09 19:07:20 +00:00
RoboErik
b6b31f2741 Merge "b/15452153 Send 0 delta volume requests" into lmp-preview-dev 2014-06-09 19:07:10 +00:00
Jae Seo
085eefd184 Merge "Fix a typo in TvContract" into lmp-preview-dev 2014-06-09 18:43:27 +00:00
Jerome Poichet
cbe8e35bda Merge "Using Manufacturer and not brand for device name" into lmp-preview-dev 2014-06-09 18:42:20 +00:00
Jae Seo
182dc33e9e Merge "TIF: Address the feedback from the API review - 3/3" into lmp-preview-dev 2014-06-09 18:38:43 +00:00
Justin Koh
eba8782a1f Add NPE check to getSystemWindowInsets 
Bug: 15452706
Change-Id: Ica83593eadd0155e1370dba268a9f15ad0affa7d
 2014-06-09 11:31:53 -07:00
Justin Koh
a5de8479f4 Merge "Fix Browser when running on a platform without webview" into klp-modular-dev 2014-06-09 18:29:39 +00:00
Justin Koh
b4be02088f Fix Browser when running on a platform without webview 
Fix Browser: can't access the WebIconDatabase. Added build version checks so
that the icon database isn't used on devices <= KITKAT: the entire class is
deprecated as of JB MR2 anyway, according to the comments.
Bug: 15088030

Change-Id: I4403b1a429c08abb288f5ee3bae7eb2e23303916
 2014-06-09 11:28:53 -07:00
Julia Reynolds
dc920984f2 Merge "Allow profile and device owners to change and get the master volume mute state." 2014-06-09 18:25:06 +00:00
Julia Reynolds
4a21b25fad Allow profile and device owners to change and get the master volume mute state. 
Also protect muting master volume with op code OP_AUDIO_MASTER_VOLUME.
Bug: 13585918
Change-Id: I91fe7ee60cd291cca15966b3127c0bb8a4828f6a
 2014-06-09 14:18:01 -04:00
Ed Heyl
f914a89073 fix conflict markers 
Change-Id: I0b95da6a8cb461dfaf7db026b6d190e2dcbe6935
 2014-06-09 10:59:22 -07:00
Alan Viverette
1b6e856e6f Optimize use of layers in ripple, update dialog styling 
BUG: 15474733
BUG: 15473856
Change-Id: I7c17865c7b2d4aad0fc3660ffac90e9f7ce8fda9
 2014-06-09 10:59:08 -07:00
Amit Mahajan
20c5ce50c4 Handle provisioning APN by turning off/on radio. 
The change is specific to AT&T as they want no signaling from device during provisioning.
I've tested following cases:
- expired AT&T SIM to make sure provisioning flow works as expected.
- airplane mode on/off with both active and expired AT&T SIM.
- wifi <-> mobile transitions work okay.
- LTE with Verizon SIM (basic sanity).

bug: 13190133

Change-Id: I215963174ae6000ae71d1dda693f95413f3d6e81
 2014-06-09 17:55:27 +00:00
Jae Seo
f30ea53306 Fix a typo in TvContract 
Assigned a new value to TYPE_ATSC_M_H so that it differs from TYPE_ATSC_C.

Change-Id: I65494fdf625a3b4840c9e8cfa4b728214d63e6df
 2014-06-09 17:50:07 +00:00
Adam Connors
b6d305ecf4 am ef4dfabe: API Review: rename FEATURE_MANAGEDPROFILES 
* commit 'ef4dfabe22df2ce86cdf732c4a27ce8dcd8fad51':
  API Review: rename FEATURE_MANAGEDPROFILES
 2014-06-09 17:44:50 +00:00
Ji-Hwan Lee
8d396392cc am 9a904962: Merge "Set mBound only when bind succeeds" into lmp-preview-dev 
* commit '9a9049626d214a6329090abbba8e067ef3005c2e':
  Set mBound only when bind succeeds
 2014-06-09 17:44:43 +00:00
Wonsik Kim
32c67ee119 am 8be96a6f: Merge "Make TvInputs aware of whether it\'s hardware-based or not" into lmp-preview-dev 
* commit '8be96a6ffa5ce1783310fe490f615ff323d1d5ed':
  Make TvInputs aware of whether it's hardware-based or not
 2014-06-09 17:44:37 +00:00
Jinsuk Kim
4d93ea5bb3 am 2a7a13e4: Merge "Remove HdmiCecService" into lmp-preview-dev 
* commit '2a7a13e4a18803b8527deca0b6ca29b6e326671f':
 2014-06-09 17:44:35 +00:00